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

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

Change-Id: I4a1427ca6e63762d61fa5de0505c3cc588e237aa