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

Change-Id: I460e14a523c56e2703fdad89c0f81368d3048bb5