This reverts commit ca40662a.

https://chromium.googlesource.com/angle/angle/+/ca40662aa81f7735d3510fa52e55d28503c7f9ec broke angle_end2end_tests on the Win Debug bots. Examples: 

https://build.chromium.org/p/chromium.gpu.fyi/builders/Win7%20Debug%20%28NVIDIA%29/builds/18718 
https://build.chromium.org/p/chromium.gpu.fyi/builders/Win8%20Debug%20%28NVIDIA%29/builds/15905 

Tests failing: 
Texture2DTest.QueryBinding/ES2_D3D11 
Texture2DTest.QueryBinding/ES2_D3D9 
Texture2DTest.QueryBinding/ES2_D3D11_9_3

Change-Id: If9da864f49e0de3a134d43ae36c2a99e9b5a2a53
Reviewed-on: https://chromium-review.googlesource.com/391130Reviewed-by: John Bauman <jbauman@chromium.org>