Merge "header-checker: Fix opaque types comparison" am: d199d5d3a0 am: 148f20a61f
am: 3593a51ab2

Change-Id: Ia482c92fd49cfcf5f06d771fcf39ce40027c9653