merge in lmp-mr1-release history after reset to 9976480a6e7fc53b40f0fe97aac29aa297bfd1b7
tree: 10d2fae2245e3aef8136513f8b6f4e12cd8664d6
  1. keystore-engine/
  2. keystore/
  3. softkeymaster/