Merge "header-checker: Encapsulate AbiDiffHelper" am: b2ddb4d536 am: c497d8caa9

Change-Id: Ib24f353b9a30ae4fdf1b3b0b554f602da5ee923f