Merge change 8258 into donut

* changes:
  Minor fixes to CheckJNI.