Merge "Revert "Revert "Build header-abi-dumper with clang-r339409b""" am: ee7cd953d6 am: 4b1d95b2ca
am: 88c8a946ab

Change-Id: Ica705d05d2eb8b146063ed04106c5f8416f4b088