Fix clang head patch for sysroot (forward port of bb47ea)