Merge "Fix CC collector thread flip and JNI critical section deadlocks."
am: 8852d809b2

* commit '8852d809b21b37a0e97ea3514ff9f13b2ec8dcb3':
  Fix CC collector thread flip and JNI critical section deadlocks.