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

Merge "vulkan/opengl: rename some vars and comments" into rvc-dev am: 0cc0df1e am: 57864a82 am: af9cb231 am: 40e22f1a

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

Change-Id: Id73c9b76b84b0d172204886443bc6e5ec9612fcf