am 8df3ea66: am b4cf2a2a: Merge "Convert Java/JNI to 64-bit, part 2."

* commit '8df3ea66994e96d72040c44099dd2d74ba15ec67':
  Convert Java/JNI to 64-bit, part 2.