Merge commit '5c0e13490a6035296333e942623b40e23bebc110' into HEAD
tree: 9b27e38be2d8c82d8c5f8338cfd0d398451a5e5a
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE