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

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

Change-Id: Ib06023379f7a064dce55b79488aed77956611040