switch from chromeos-base/chromeos-test to virtual/target-os-test

This is mechanical -- virtual/target-os-test depends on chromeos-test,
so there shouldn't be any real difference in the build.

BUG=chromium:329920
TEST=`cbuildbot {arm,amd64,x86}-generic-full` pass
CQ-DEPEND=CL:198230
CQ-DEPEND=CL:198157

Change-Id: I7072de0c988696e059bf02831d3e83543c0ecbf6
Reviewed-on: https://chromium-review.googlesource.com/198231
Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/build_library/test_image_util.sh b/build_library/test_image_util.sh
index dcbc6e0..c380498 100755
--- a/build_library/test_image_util.sh
+++ b/build_library/test_image_util.sh
@@ -14,7 +14,7 @@
   local root_dev_dir="${root_fs_dir}/usr/local"
 
   emerge_to_image --root="${root_fs_dir}" chromeos-test-root
-  emerge_to_image --root="${root_dev_dir}" chromeos-test
+  emerge_to_image --root="${root_dev_dir}" virtual/target-os-test
 }
 
 # Converts a dev image into a test or factory test image
diff --git a/build_packages b/build_packages
index 8b3702d..f4901fc 100755
--- a/build_packages
+++ b/build_packages
@@ -208,7 +208,7 @@
     PACKAGES+=( chromeos-base/autotest-factory-install )
   fi
   if [[ "${FLAGS_withtest}" -eq "${FLAGS_TRUE}" ]]; then
-    PACKAGES+=( chromeos-base/chromeos-test )
+    PACKAGES+=( virtual/target-os-test )
   fi
   if [[ "${FLAGS_withautotest}" -eq "${FLAGS_TRUE}" ]]; then
     PACKAGES+=( chromeos-base/autotest-all )