Merge change 1563

* changes:
  Strip some cruft from the CheckJNI method invocation macros.