[automerger skipped] Merge "vulkan/opengl: rename some vars and comments" am:...

[automerger skipped] Merge "vulkan/opengl: rename some vars and comments" am: 0360dae8 am: 90ff6087 -s ours

am skip reason: Change-Id I23524a0c65d0c7c31e4dc3859ce7b979f9093553 with SHA-1 9592422b is in history

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

Change-Id: I21429d194c865e55ae2e4b26a74f3289addef9c1