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

Change-Id: I1c35beb6f96bcf3a30fff7f8ab1f1eb18d3acb75