Merge "header-checker: Encapsulate AbiDiffHelper"