Support using opaque JNI ids am: 21d5994583
am: 9e087db147

Change-Id: I496a113ed73174635c705d924d9bba6924607b97