Merge "Don't use local ref for cached jclass reference in JNI code"