Merge "Remove llvm-generated-headers"