Android 5.0.0 release 2
merge in lmp-release history after reset to 90c4779146c9ac154fe85cd6a0775f8e1fc29be8
tree: 8009432b18232a9a4ff20e050a8ad213076489e0
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/