Merge "Fix ndk-build using windows/clang3.1 with -no-canonical-prefixes"