Merge "NativeCrypto: serialize EC keys differently"