Merge "Fix JNI array memory leak"