Merge "Remove NdkJavaVMHelper.h from NDK directory"