Support using opaque JNI ids
am: 21d5994583

Change-Id: Id91ef46d54ea16d679ce428106537fefae162490