Merge commit \'b0adba8170cb5df45629876998229bc0f3c6dd6b\' into HEAD
am: 5c2c1f9448

* commit '5c2c1f9448ed3b8d749bf332eb0d47be54cfa10e':
tree: 351a5efe0c4279129e304b6401134555302bab50
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE