Merge "Build header-abi-dumper with clang-r339409b"
am: 051eabbbe6

Change-Id: Ic34eed3a1b2ae84b36c0c061318cfa93edc7e9b1