am c1b4a1ef: Merge "Change JNI calling convention for mips"

* commit 'c1b4a1efcfb249651bc9ae34c9285a693ede2550':
  Change JNI calling convention for mips