Merge "Keystore 2.0: Sync output format of generated headers"