Build Observatory as part of runtime

tools/testing/dart/test_suite.dart

Index: tools/testing/dart/test_suite.dart
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index 98a68066aeb31244a2500fbc42755d1924da3022..7253aec6e2d8019bc5f9c12b86ca8a1158a1c3a1 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -407,7 +407,7 @@ abstract class TestSuite {
      *      pkg/PACKAGE_NAME
      *      pkg/third_party/PACKAGE_NAME
      *      third_party/pkg/PACKAGE_NAME
-     *      runtime/bin/vmservice/PACKAGE_NAME
+     *      runtime/observatory/PACKAGE_NAME
      */
 
     // Directories containing "-" are not valid pub packages and we therefore
@@ -420,8 +420,7 @@ abstract class TestSuite {
       listDir(dartDir.append('pkg'), isValid),
       listDir(dartDir.append('pkg').append('third_party'), isValid),
       listDir(dartDir.append('third_party').append('pkg'), isValid),
-      listDir(dartDir.append('runtime').append('bin').append('vmservice'),
-              isValid),
+      listDir(dartDir.append('runtime').append('observatory'), isValid),
     ];
     return Future.wait(futures).then((results) {
       var packageDirectories = {};