[gpu tests] Map 64 bit configuration tags to general configuration tags

This CL maps the debug-x64 tag to debug and release-x64 tag to release.
This is so that typ will know that these tags do not conflict when
they are in separate expectations. This CL is a follow up to
crrev.com/c/2097218.

Bug: 1045339
Change-Id: I6740f433e83789f6de8c54e1d25e249623c6ed4a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2097237
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749412}

content/test/gpu/gpu_tests/test_expectations_unittest.py

@@ -36,6 +36,8 @@ GENERIC_CONDITIONS = OS_CONDITIONS + GPU_CONDITIONS
 _map_specific_to_generic = {sos:'win' for sos in WIN_CONDITIONS}
 _map_specific_to_generic.update({sos:'mac' for sos in MAC_CONDITIONS})
 _map_specific_to_generic.update({sos:'android' for sos in ANDROID_CONDITIONS})
+_map_specific_to_generic['debug-x64'] = 'debug'
+_map_specific_to_generic['release-x64'] = 'release'
 
 _get_generic = lambda tags: set(
     [_map_specific_to_generic.get(tag, tag) for tag in tags])