Merge commit \'5c0e13490a6035296333e942623b40e23bebc110\' into HEAD
am: 46fbb2b5df

* commit '46fbb2b5df1aa40fb248eea281f267339f99ed1e':
tree: 5efe34cb465e77405e6acebe88e52b3a273f33a1
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE