Small vogar changes in response to the review for change 49052.
diff --git a/libcore/tools/runner/java/vogar/CaliperSpec.java b/libcore/tools/runner/java/vogar/CaliperSpec.java
index 70095aa..f0c0e39 100644
--- a/libcore/tools/runner/java/vogar/CaliperSpec.java
+++ b/libcore/tools/runner/java/vogar/CaliperSpec.java
@@ -30,8 +30,8 @@
         return super.matches(file) && file.getName().endsWith("Benchmark.java");
     }
 
-    public boolean supports(String clazz) {
-        return clazz.endsWith("Benchmark");
+    public boolean supports(String className) {
+        return className.endsWith("Benchmark");
     }
 
     public Class<? extends Runner> getRunnerClass() {
diff --git a/libcore/tools/runner/java/vogar/DeviceDalvikVm.java b/libcore/tools/runner/java/vogar/DeviceDalvikVm.java
index 7243b1e..dfbfada 100644
--- a/libcore/tools/runner/java/vogar/DeviceDalvikVm.java
+++ b/libcore/tools/runner/java/vogar/DeviceDalvikVm.java
@@ -31,7 +31,7 @@
 
     /** A list of generic names that we avoid when naming generated files. */
     private static final Set<String> BANNED_NAMES = new HashSet<String>();
-    {
+    static {
         BANNED_NAMES.add("classes");
         BANNED_NAMES.add("javalib");
     }
diff --git a/libcore/tools/runner/java/vogar/JUnitSpec.java b/libcore/tools/runner/java/vogar/JUnitSpec.java
index d8169ba..626efcb 100644
--- a/libcore/tools/runner/java/vogar/JUnitSpec.java
+++ b/libcore/tools/runner/java/vogar/JUnitSpec.java
@@ -32,10 +32,10 @@
                 || filename.contains("Tests"));
     }
 
-    public boolean supports(String clazz) {
-        return clazz.endsWith("Test")
-                || clazz.endsWith("TestSuite")
-                || clazz.contains("Tests");
+    public boolean supports(String className) {
+        return className.endsWith("Test")
+                || className.endsWith("TestSuite")
+                || className.contains("Tests");
     }
 
     public Class<? extends Runner> getRunnerClass() {
@@ -49,7 +49,6 @@
     public Classpath getClasspath() {
         // TODO: jar up just the junit classes and drop the jar in our lib/ directory.
         return Classpath.of(
-                new File("out/target/common/obj/JAVA_LIBRARIES/core-tests-luni_intermediates/classes.jar").getAbsoluteFile(),
                 new File("out/host/common/obj/JAVA_LIBRARIES/junit_intermediates/javalib.jar").getAbsoluteFile());
     }
 }
diff --git a/libcore/tools/runner/java/vogar/JtregSpec.java b/libcore/tools/runner/java/vogar/JtregSpec.java
index 1c43949..8c06cc8 100644
--- a/libcore/tools/runner/java/vogar/JtregSpec.java
+++ b/libcore/tools/runner/java/vogar/JtregSpec.java
@@ -94,7 +94,7 @@
         }
     }
 
-    public boolean supports(String clazz) {
+    public boolean supports(String className) {
         // the jtreg runner cannot run prebuilt classes
         return false;
     }
diff --git a/libcore/tools/runner/java/vogar/MainSpec.java b/libcore/tools/runner/java/vogar/MainSpec.java
index d2bebfb..5a0bcf5 100644
--- a/libcore/tools/runner/java/vogar/MainSpec.java
+++ b/libcore/tools/runner/java/vogar/MainSpec.java
@@ -25,7 +25,7 @@
  */
 class MainSpec extends NamingPatternRunnerSpec {
 
-    public boolean supports(String clazz) {
+    public boolean supports(String className) {
         return true;
     }
 
diff --git a/libcore/tools/runner/java/vogar/Outcome.java b/libcore/tools/runner/java/vogar/Outcome.java
index 253a3cc..471f937 100644
--- a/libcore/tools/runner/java/vogar/Outcome.java
+++ b/libcore/tools/runner/java/vogar/Outcome.java
@@ -83,15 +83,20 @@
      * java.lang.IntegerTest.
      */
     public String getSuiteName() {
-        int lastDot = outcomeName.lastIndexOf('.');
-        return lastDot == -1 ? "defaultpackage" : outcomeName.substring(0, lastDot);
+        int split = split(outcomeName);
+        return split == -1 ? "defaultpackage" : outcomeName.substring(0, split);
     }
 
     /**
      * Returns the specific action name, such as BitTwiddle or testBitTwiddle.
      */
     public String getTestName() {
-        int lastDot = outcomeName.lastIndexOf('.');
-        return lastDot == -1 ? outcomeName : outcomeName.substring(lastDot + 1);
+        int split = split(outcomeName);
+        return split == -1 ? outcomeName : outcomeName.substring(split + 1);
+    }
+
+    private static int split(String name) {
+        int lastHash = name.indexOf('#');
+        return lastHash == -1 ? name.lastIndexOf('.') : lastHash;
     }
 }
diff --git a/libcore/tools/runner/java/vogar/RunnerSpec.java b/libcore/tools/runner/java/vogar/RunnerSpec.java
index 73a4ce1..8054b89 100644
--- a/libcore/tools/runner/java/vogar/RunnerSpec.java
+++ b/libcore/tools/runner/java/vogar/RunnerSpec.java
@@ -35,9 +35,9 @@
     /**
      * Returns true if this runner can exercise {@code clazz}.
      *
-     * @param clazz a fully qualified classname.
+     * @param className a fully qualified classname.
      */
-    boolean supports(String clazz);
+    boolean supports(String className);
 
     /**
      * Return the class for the TestRunner
diff --git a/libcore/tools/runner/java/vogar/Vogar.java b/libcore/tools/runner/java/vogar/Vogar.java
index 6286d87..b249abd 100644
--- a/libcore/tools/runner/java/vogar/Vogar.java
+++ b/libcore/tools/runner/java/vogar/Vogar.java
@@ -141,6 +141,10 @@
             System.out.println("      Usually this is <SDK>/platforms/android-<X.X>/android.jar");
             System.out.println("      where <SDK> is the path to an Android SDK path and <X.X> is");
             System.out.println("      a release version like 1.5.");
+            System.out.println();
+            System.out.println("      To test against APIs added since the latest SDK, use");
+            System.out.println("      out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar");
+            System.out.println();
             System.out.println("      Default is: " + sdkJar);
             System.out.println();
             System.out.println("  --verbose: turn on verbose output");