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

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