am 400918b0: am 4881d8d3: Merge "Change KeyStore to use Modified UTF-8 to...
am 400918b0: am 4881d8d3: Merge "Change KeyStore to use Modified UTF-8 to match NativeCrypto" into jb-dev
* commit '400918b0':
Change KeyStore to use Modified UTF-8 to match NativeCrypto