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

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

Change-Id: If6c7519c59996aa0cc19841048544889b4bb2265