Improve how we handle packages/ HTML imports. This resolves better any valid

pkg/pkg.status

Index: pkg/pkg.status
diff --git a/pkg/pkg.status b/pkg/pkg.status
index c2b905f178b17de42d70d5cd7186c48e2d44c897..80fad7cbe4b574a6d554e41c88d2e7b7cb8a0f48 100644
--- a/pkg/pkg.status
+++ b/pkg/pkg.status
@@ -122,6 +122,8 @@ intl/test/find_default_locale_standalone_test: Fail # Issue 8110
 unittest/test/mock_regexp_negative_test: Skip
 unittest/test/mock_stepwise_negative_test: Skip
 polymer/example/canonicalization: Skip
+polymer/example/canonicalization2: Skip
+polymer/example/canonicalization3: Skip
 
 third_party/angular_tests/browser_test: StaticWarning # Issue 15890
 
@@ -131,11 +133,15 @@ third_party/angular_tests/browser_test: StaticWarning # Issue 15890
 unittest/test/mock_regexp_negative_test: Skip
 unittest/test/mock_stepwise_negative_test: Skip
 polymer/example/canonicalization: Skip
+polymer/example/canonicalization2: Skip
+polymer/example/canonicalization3: Skip
 
 third_party/angular_tests/browser_test: StaticWarning # Issue 15890
 
 [ $compiler == dart2js && $runtime == none]
 polymer/example/canonicalization: Skip
+polymer/example/canonicalization2: Skip
+polymer/example/canonicalization3: Skip
 
 [ $compiler == dart2js && $csp ]
 unittest/test/mirror_matchers_test: Skip # Issue 12151
@@ -156,7 +162,11 @@ stack_trace/test/chain_test: Fail # Issues 15171 and 15105
 crypto/test/sha256_test: Slow, Pass
 crypto/test/sha1_test: Slow, Pass
 polymer/example/component: Fail # Issue 13198
-polymer/example/canonicalization/test/canonicalization_test: Fail, OK # tests development only behavior
+polymer/example/canonicalization/test/dev_test: Fail, OK # tests development only behavior
+polymer/example/canonicalization/test/dev2_test: Fail, OK # tests development only behavior
+polymer/example/canonicalization/test/dev3_test: Fail, OK # tests development only behavior
+polymer/example/canonicalization/test/dir/dev_test: Fail, OK # tests development only behavior
+polymer/example/canonicalization/test/dir/dev2_test: Fail, OK # tests development only behavior
 
 [ $compiler == dart2js && $runtime == chromeOnAndroid ]
 docgen/test/single_library_test: Fail # TODO(kasperl): Please triage.
@@ -259,7 +269,11 @@ unittest/test/unittest_test_returning_future_using_runasync_test: Fail # 13921
 unittest/test/unittest_testcases_immutable_test: Fail # 13921
 unittest/test/unitttest_group_name_test: Fail # 13921
 polymer/test/custom_event_test: Pass, Crash # 14360
-polymer/example/canonicalization/test/canonicalization_deploy_test: Fail, OK # tests deploy only behavior
+polymer/example/canonicalization/test/deploy_test: Fail, OK # tests deploy only behavior
+polymer/example/canonicalization/test/deploy2_test: Fail, OK # tests deploy only behavior
+polymer/example/canonicalization/test/deploy3_test: Fail, OK # tests deploy only behavior
+polymer/example/canonicalization/test/dir/deploy_test: Fail, OK # tests deploy only behavior
+polymer/example/canonicalization/test/dir/deploy2_test: Fail, OK # tests deploy only behavior
 
 [ $compiler == none && ( $runtime == dartium || $runtime == drt ) && $checked ]
 polymer/test/custom_event_test: Skip # http://dartbug.com/15517