am d2237dfe: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto"

* commit 'd2237dfe7d84c36e5cc9399a444f9befb559af97':
  Change KeyStore to use Modified UTF-8 to match NativeCrypto