Merge "Fix pessimizing move."
tree: ab5d28c69785576c699d61b04538ade1165e47f8
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/