Merge "Undefine 'near' and 'far' in mat4.h for host Windows" into main am:...

Merge "Undefine 'near' and 'far' in mat4.h for host Windows" into main am: 6b960372 am: 85b997fd

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2990049



Change-Id: Iafeb10154fce0a508377d750cfb650f3785b6ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>