am 3a7d9e62: Rewrite legacy methods in terms of new methods

* commit '3a7d9e626fa6c0e116c07be912c319aad6e08614':
  Rewrite legacy methods in terms of new methods
tree: 4b296ba80c0b94585c7d81747cf540cb50acd2c9
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/