Merge "vulkan/opengl: rename some vars and comments" am: 0360dae827

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

Change-Id: I5203f40b5c36df7ef60be9ea4b94fdcbf3b40eff