Merge change I909ce240

* changes:
  Iterate in JNI thread exit check.