Revert^2 "Support using opaque JNI ids" am: 79d6c800cd am: 87c1dec9c7
am: 8f62edb346

Change-Id: Ia835a6c461c03d10992c130087586275a66e4859