am 4f93d04c: am 03d6a347: (-s ours) am 2ac5cb65: (-s ours) Merge "Fix pessimizing move."

* commit '4f93d04c7b6e60d090ec83b53a88073cda6f6e13':
tree: 1171e0f448d2a7cc9a592403de376f72ffb73ab1
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/