Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS"