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

* commit '2ac5cb651b7fe67c1ceb36bfabdeac8ad2d352f2':
  Fix pessimizing move.
tree: 6bfef2f6ef34fcca62737816efbc9383bf17a4ba
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/