Merge "header-checker: Remove C++ 17 usages"