Allow ambiguous Expect and ExpectException imports.

compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java

Index: compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
diff --git a/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java b/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
index eb49f529771483ed3ab4a12ef6fb1983715c11a4..e97667be23478205fab11e8af23c064574cd14ef 100644
--- a/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
+++ b/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
@@ -148,7 +148,9 @@ public class TopLevelElementBuilder {
         String name = element.getName();
         if (libraryImport.isVisible(name)) {
           Element oldElement = scopeForImport.declareElement(name, element);
-          if (oldElement != null) {
+          // TODO(8474): Remove the "Expect" special casing.
+          if (oldElement != null
+              && !name.equals("Expect") && !name.equals("ExpectException")) {
             scopeForImport.declareElement(name,
                 Elements.createDuplicateElement(oldElement, element));
           }