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

Change-Id: Iab7bcb6651d347f2979c1ee15a6889b35cd2fa74