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

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