Merge "Revert "Build header-abi-dumper with clang-r339409b"" am: 28cd5ef94a am: 67f078ec2e
am: 07535abe95

Change-Id: I947183af43a1cb1b7e994745d5e58407dddf9f76