Merge "Revert "jni: Punt to generic JNI for mips""