[infra] Merge SwiftShader into CPU dimensions logic
[infra] Merge SwiftShader into CPU dimensions logic

Followup to https://skia-review.googlesource.com/c/skia/+/270838

Change-Id: I5b6146abc6f84499a1e1014610221d276254f962
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/271060
Commit-Queue: Mike Klein <14574f09dfa9b4e14759b88c3426a495a0e627b0@google.com>
Auto-Submit: Ben Wagner aka dogben <3ef7217be91069877d94f7907ce5479000772cd3@google.com>
Reviewed-by: Mike Klein <14574f09dfa9b4e14759b88c3426a495a0e627b0@google.com>

google/skia,google/skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,google/skia,google/skia,aosp-mirror/platform_external_skia,google/skia,google/skia,google/skia,google/skia,google/skia,aosp-mirror/platform_external_skia,aosp-mirror/platform_external_skia,google/skia