Merge "Remove unnecessary dependency on Clang headers."