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

Change-Id: Ic38932a073b87df712b94c76b3568e44dd36ebd4