Merge "Fix ndk-build warning in windows"