Merge "header-checker: Remove dead code from IRReader" am: 35d54ba19f
am: da9feb07fc

Change-Id: I5439a3319375eb4974baa5409874d6bca67bc9a6