nn: move VTS / CTS to new package

BUG=b:182254380
TEST=emerge-volteer aosp-frameworks-ml-nn-vts && cros deploy <DUT>

Change-Id: I359f44a2c593aed181a3663b3e6378e06ff0ef30
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/frameworks/ml/+/2745351
Tested-by: Jim Pollock <jmpollock@chromium.org>
Auto-Submit: Jim Pollock <jmpollock@chromium.org>
Commit-Queue: Stuart Langley <slangley@chromium.org>
Reviewed-by: Stuart Langley <slangley@chromium.org>
diff --git a/nn/BUILD.gn b/nn/BUILD.gn
index c1d5e97..be3d506 100644
--- a/nn/BUILD.gn
+++ b/nn/BUILD.gn
@@ -14,8 +14,6 @@
       ":common_testrunner",
       ":runtime_testrunner",
       ":runtime_generated_testrunner",
-      "chromeos/tests:vts",
-      "chromeos/tests:cts",
     ]
   }
 }
diff --git a/nn/README.md b/nn/README.md
index 168b544..f4a21f8 100644
--- a/nn/README.md
+++ b/nn/README.md
@@ -98,10 +98,8 @@
 We provide a set of tools to verify the correct functioning of a vendor HAL. To
 use them, follow these steps.
 
-1. Enable the testing tools by specifying the USE flag `nnapi_driver_tests`.
-
-1. Rebuild the image or use `cros deploy` to update the `aosp-frameworks-ml-nn`
-   package to get the tools onto your DUT.
+1. Build `chromeos-base/aosp-frameworks-ml-nn-vts` and `cros deploy` to your DUT.
+   You may need to use `--root=/usr/local` depending on disk space.
 
 1. Check that the following executables are now available on your DUT:
    * Vendor Test Suites. These test the HAL directly through the IDevice
diff --git a/nn/chromeos/tests/BUILD.gn b/nn/chromeos/tests/BUILD.gn
index 053484e..cf01d7a 100644
--- a/nn/chromeos/tests/BUILD.gn
+++ b/nn/chromeos/tests/BUILD.gn
@@ -10,6 +10,7 @@
 group("all") {
   deps = [
     ":vts",
+    ":cts",
   ]
 }