Merge "Fix clang 3.1 under cygwin environment."