Merge "Fix Keymaster HAL crash." into oc-dev am: a22bc7450b
am: 839ef0db40

Change-Id: Iff8c31d686680a33674a4f5a480c3bf90c8bd4be