am ecd31154: Merge change 22183 into eclair

Merge commit 'ecd3115415793a6d39d3092bbba569bad77eb765'

* commit 'ecd3115415793a6d39d3092bbba569bad77eb765':
  Progress toward indirect JNI references.