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

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



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