Revert "Make Android emulator tests use GLES3 rather than GLES2"

This reverts commit df0350bffdb5f2854167be596417f9394d7ef0ba.

Reason for revert: Suspected cause of test timeout on https://ci.chromium.org/ui/p/chromium/builders/ci/android-14-x64-rel/8889/overview and https://ci.chromium.org/ui/p/chrome/builders/ci/test-tablet/39986/overview

Original change's description:
> Make Android emulator tests use GLES3 rather than GLES2
>
> Removes the GLES 2 override for Android x86 emulators to unblock the
> GLES 2 code path removal.
>
> This CL in Skia was merged first to fix the crash:
> https://skia-review.googlesource.com/c/skia/+/1085796
>
> Bug: 444049511
> Change-Id: Ia4ddd706bf6234b8331018a4ad5ecec43296dcf1
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7057531
> Reviewed-by: Vasiliy Telezhnikov <vasilyt@chromium.org>
> Reviewed-by: Peter McNeeley <petermcneeley@google.com>
> Commit-Queue: Sky Debreuil <skydebreuil@google.com>
> Cr-Commit-Position: refs/heads/main@{#1537290}

Bug: 444049511
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I940d909204136ec8906bae517b049877d354c340
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7100018
Owners-Override: Keigo Oka <oka@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Keigo Oka <oka@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1537740}