Merge "vulkan/opengl: rename some vars and comments" into rvc-dev am: 0cc0df1e13

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

Change-Id: I5981a2b67ca28aa5fd81333ad8d65ce122ba206f