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

Change-Id: I87252d434812bc71afcd01c5af9a4ec65ef2499c