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

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

Change-Id: I13f595398beb7bcc7195225942ffd51bb5f3bccf