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

Change-Id: I6d6aa111778048b93602a8edae50a2851190fbe0