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

Change-Id: Ie966b2ae8627b97c79d67d400af322b2a1494a6d