Performing a roll with this changes produces
https://android-review.googlesource.com/c/1548235

Bug: b/147316305
Bug: angleproject:5456
Test: scripts/roll_aosp.sh && m ANGLE
Change-Id: I0f5a698e81a1299abde7cfccb4e1467c8dc02aad
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2625168
Commit-Queue: Tim Van Patten <timvp@google.com>
Reviewed-by: Tim Van Patten <timvp@google.com>
Reviewed-by: Geoff Lang <geofflang@chromium.org>