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

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

Change-Id: I6304d67550bd947090b239c1b94e5693c842187f