Merge "Change JNI calling convention for mips"