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

* commit '70d35923cd10cc016201127e607d85a58060caf3':
  Remove dependency on JNIHelp header side effects.