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

Change-Id: I614729508c91560151fbb629d8412b75e8744b1f