am ea2eb595: am 2ac5cb65: (-s ours) Merge "Fix pessimizing move."

* commit 'ea2eb595f5070d4dcfa06df0af07b3a8c973e62c':
  Fix pessimizing move.
tree: ab5d28c69785576c699d61b04538ade1165e47f8
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/