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

* commit '29c54e37b225989a3adebf0feca1d574989a6c8b':
  Fix various memory errors.
tree: 23e2e4b532de30236e0175e7dbf9b845b968dd45
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE