am 95521ced: am 226476bd: Merge "Remove dependency on JNIHelp header side effects." into klp-dev

* commit '95521cedc191027245655105f6f5b7c87654a364':
  Remove dependency on JNIHelp header side effects.