Complete the fix started in http://crrev.com/c/2812698

Bug: angleproject:5811
Change-Id: I9fa50b31dda116e01203d65d47dc6420391e999d
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2818243
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>