Merge change 22183 into eclair

* changes:
  Progress toward indirect JNI references.