Merge "Fix various memory errors." am: 29c54e37b2
am: 7388228191

* commit '7388228191dc1eda446ea6e79a6fcec3507eca00':
  Fix various memory errors.
tree: ef9045cbf936e960757093754db3260e865091a8
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE