am 094460fd: am a728627b: Merge "Fix JNI compiler for mips64"

* commit '094460fdb480a33e0249615a185c24abc8106110':
  Fix JNI compiler for mips64