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

Change-Id: I0245e224dfcbefc596e16ae8f52f95d0b9921fc1