Merge change 22965 into eclair

* changes:
  Fix some JNI indirect reference stuff.