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

Change-Id: Ia1a34502fac438a663ea680c7506fbdc88090106