Revert^2 "Support using opaque JNI ids"
am: 79d6c800cd

Change-Id: I14ba35e8e3ea2cb3d6c47c38068db98c444247ff