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

Change-Id: I7a8bed35f2cfc0c25a4e3cbd3f37c6dda86c5b12