Merge "Identify samplerExternalOES in sampler array" into tm-dev am: 11cae33bb2

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/17576148

Change-Id: I51743256718a7e9e01d40224d1c85b380acbf4e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>