am 0af9b8c6: Revert "Revert "Remove dependency on JNIHelp header side effects.""

* commit '0af9b8c60cdb8ec126085abce836c6811537cde2':
  Revert "Revert "Remove dependency on JNIHelp header side effects.""