Merge "OpenGL: Use more inclusive terms" am: 303d4ecdad am: 4464572a00 am: 302b6f8f50 am: 171f2e8621 am: 45f145093a

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

Change-Id: I4699eec711e458ea2b3381040f71027f1deb4939