am d0f35a1a: Merge commit \'049462c2920b2082bde538210b1029da19b15788\' into HEAD

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