merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297fe6e406736a
tree: 2e72be7fead8fcd9df2885e7fdd735b0ff26ef09
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/