Merge "Fix CC collector thread flip and JNI critical section deadlocks."