Revert "Cherrypick upstream change to fix build."

Revert submission 2462733-fix-clang-tools-r487747

Rollback compiler update

Reverted changes: /q/submissionid:2462733-fix-clang-tools-r487747

Change-Id: Ifc66c521ce977931c021f209e39557437572638c
8 files changed