Merge "header-checker: Remove obsolete merge-abi-diff" am: 94989c7e00

Change-Id: I7233df0fdc1319dfacaf936dfc5b3b1e2caa519d