Merge "Fix GLESv2_enc subtraction not protected" am: dfa95eb45d

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

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