am 96d6d786: Cleanup password change and removal logic.

* commit '96d6d7868303ad87f1f408c40d3c44bcb39f561e':
  Cleanup password change and removal logic.
tree: 8557c54d69bf2b2a6076b9be6d29bc3814bb5c18
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/