Merge "OpenGL: Use more inclusive terms" am: 303d4ecdad am: 4464572a00

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

Change-Id: Ib0b17ff7397b2682b69b0ba1d331a64590d3816e