am f8fe8731: Merge "Disable -Xjnigreflimit."

* commit 'f8fe8731a5302105b285d549e4a0265a35db3e2e':
  Disable -Xjnigreflimit.