Merge "Fix native_handle leak in CryptoHal" into pi-dev
am: 4871096741

Change-Id: I8363d0e5c51922fe36625188bde2de291bf22b4b