Merge "Reduce the scope of CheckJNI." am: 0280eb019b am: b7cf680260
am: c832390270

Change-Id: If81ae2f2439b2b41eeec980efde609d2c679ac8f