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: 112227c8 am: d9f26633

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

Change-Id: I13f818fa62a25be903de72cedfe32e19b896c0f3