am e5c18d03: Fix pessimizing move.

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