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

Change-Id: I6a29be03c33295b49a149f4f3b5e6d61b4c448c4