Merge "header-checker: Remove C++ 17 usages" am: 5ff740f0ed am: f20b5dfe19 am: 49e4a73918

Change-Id: I8728f2af3c3ed4ec41ac962f0cdf95a0962dd0e1