am c55921b0: Merge commit \'72f6fde4563f9e5f2aff8211a54342d752aa7029\' into HEAD

* commit 'c55921b02233fdbc68491e814a01eb2b6996ff6a':
tree: ee949e5694e998334e4aa439d87d706ce5f907bf
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/