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: eb00380b am: 29b107d5

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

Change-Id: I9c678a14c849a4d47b607a7f5110ab08ea4a72f3