Merge "header-checker: Remove type_id"
am: f253fc4007

Change-Id: Id79e1e94b044b50bf78bc0129744dc50d8326953