am 828311c1: Merge change 8258 into donut

Merge commit '828311c1293ba533065895cc375abb143e14b69a'

* commit '828311c1293ba533065895cc375abb143e14b69a':
  Minor fixes to CheckJNI.