Revert "Fix VK-GL-CTS build error" This reverts commit a676c4725490ee896e1154d5fbe1b1c1adc83678. Reason for revert: CTS build issue is fixed upstream and rolled into ANGLE. Bug: angleproject:432337091 Original change's description: > Fix VK-GL-CTS build error > > ... temporarily by overriding the offending file until the upstream fix > lands. > > Bug: angleproject:432337091 > Change-Id: I878561e0856e43b657bcaf08a7563ac639794098 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6775382 > Reviewed-by: Geoff Lang <geofflang@chromium.org> > Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Bug: angleproject:432337091 Change-Id: I1607d32b4007df91c721601fc16bcb05932f2567 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6777764 Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>