This reverts commit e7568b68da8a216dc22cdc1c6d8903c94096c846 and relands c6f7b720ecfa6db40c648eb05e319f8a817110e9. The culprit was: missed that libc also had a dependency on one of the copies of `google-benchmark` Also opportunistically fixed indentation from prev. change. Differential Revision: https://reviews.llvm.org/D112012