Merge "Hide unused options in header-abi-linker help message"
am: 23f68b676f

Change-Id: I8750174eb992a8e01909180bd748a94404daaec4