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