Merge "Revert "Build header-abi-dumper with clang-r339409b"" am: 28cd5ef94a
am: 67f078ec2e

Change-Id: I401dba176c5ae3e92058c4a9abb74e830a93c9cf