am b2fa7346: am d83ee1e2: Merge "More checks in JNI RegisterNatives"

* commit 'b2fa7346bf5c5057fa9da9f548577af183f0a4d1':
  More checks in JNI RegisterNatives