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

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