Merge "Enable generic JNI for x86 and ARM when interpret-only."