Merge "Moved contents of clang_cflags into cflags"