Merge "gles: fix regressions in negative api" am: 31a0bd2d92

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

Change-Id: If4303382b0e117a616a0b38bd01480035ed6fe4a