Merge "oem_keystore: Fix oem_keystore header with updated keystore."