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

Change-Id: I1c98001e4c584111c0920be60e16a6f5e65ed61d