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

Change-Id: Icf6147fec6566a510ba2845419db90fd11822204