am f8696fa7: am 2115c7ed: am f8fe8731: Merge "Disable -Xjnigreflimit."

* commit 'f8696fa79b0bb1ecc9eea0229eb989f25feaa1c0':
  Disable -Xjnigreflimit.