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

Change-Id: Id2089838fc1219271b1fd177e8b37a3ed9d710f3