WPT CSS rename: move remaining directories into css/

This is part of getting the big CSS rename imported:
https://github.com/w3c/web-platform-tests/pull/8011

Includes a fix not yet landed upstream:
https://github.com/w3c/web-platform-tests/pull/8048

Bug: 780700
Change-Id: Ic3654ba6d6440f650a011c547868bdcee59061ec
No-Export: true
TBR: [email protected]
Reviewed-on: https://chromium-review.googlesource.com/752570
Commit-Queue: Philip Jägenstedt <[email protected]>
Reviewed-by: Philip Jägenstedt <[email protected]>
Reviewed-by: Robert Ma <[email protected]>
Cr-Commit-Position: refs/heads/master@{#513671}
diff --git a/third_party/WebKit/LayoutTests/VirtualTestSuites b/third_party/WebKit/LayoutTests/VirtualTestSuites
index 6c7286271..48239a97 100644
--- a/third_party/WebKit/LayoutTests/VirtualTestSuites
+++ b/third_party/WebKit/LayoutTests/VirtualTestSuites
@@ -280,7 +280,7 @@
   },
   {
     "prefix": "scalefactor200",
-    "base": "external/wpt/css-paint-api/hidpi",
+    "base": "external/wpt/css/css-paint-api/hidpi",
     "args": ["--force-device-scale-factor=2"]
   },
   {