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

* commit '226476bd6067864b860b48ed5b88982e131c20d9':
  Remove dependency on JNIHelp header side effects.