Merge "Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables."