Merge "Remove redundant clang cppflags"