Revert "Support using opaque JNI ids" am: b476a29a2c am: 777fa360ca
am: d2150b208c

Change-Id: Ica3c75ee577134fc34b28c610bce4e40d5bbc962