Merge "More JNI compiler tests and small fix"