Reintroduce the change that was previously reverted here:
https://chromium-review.googlesource.com/c/angle/angle/+/1064770

This includes a tentative fix the issue on Android that prompted the revert.

Bug: angleproject:2480
Change-Id: I04be55d9dead00500adaa5f56458cb93957f2535
Reviewed-on: https://chromium-review.googlesource.com/1065799
Commit-Queue: Luc Ferron <lucferron@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>