Merge "Revert "Build header-abi-dumper with clang-r339409b""