Merge "keystore: fix memory leak from readKeymasterBlob" am: 3746fcf327
am: 1156db460e

Change-Id: I6d6aa111778048b93602a8edae50a2851190fbe0
tree: 8b09394bcb91326b9db68196c244e4654c7e4560
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE