Merge "header-checker: Fix unit test include directories" am: 3e48f47adc am: a65d6604df
am: 88e49443d3

Change-Id: I1d9e10f75b0ca499705097c54d9110a1491c7ec1