[bazel] Revert 539d5d40fd42 and 223314bc04d1#169412

googlewalt wants to merge 2 commits intollvm:mainllvm/llvm-project:mainfrom

googlewalt:revertgooglewalt/llvm-project:revertCopy head branch name to clipboard