am 670018fd: Merge "Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables."

* commit '670018fdaed33a6872925e60fd95c5f401e45444':
  Remove unnecessary CLANG_CONFIG_EXTRA_*_C_INCLUDES variables.