Merge "Add support for new defines in v4.17.3 headers."