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

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

Change-Id: I2f73123211a77b5e73da3f192d322c9236ef0ee8