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