Merge "Convert type_queue to a member of AbiDiffHelper"