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

Change-Id: I7dce1261050c3c320fd389d38843e5152e7359fc