Merge "Fix Keymaster HAL crash." into oc-dev