Merge "Fix JNI abort due to mismatched critical get/release call."