reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
tree: 376b31f20a0506c2170ca2210b6785f5782870e7
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/