Merge "Remove dependency on JNIHelp header side effects." into klp-dev