Merge change 21813 into donut

* changes:
  CTS: Fix console search for test packages
diff --git a/tools/host/src/com/android/cts/HostConfig.java b/tools/host/src/com/android/cts/HostConfig.java
index d8d96b4..116a46f 100644
--- a/tools/host/src/com/android/cts/HostConfig.java
+++ b/tools/host/src/com/android/cts/HostConfig.java
@@ -66,6 +66,9 @@
     private CaseRepository mCaseRepos;
     private ResultRepository mResultRepos;
     private PlanRepository mPlanRepos;
+
+    // key: app package name
+    // value: TestPackage
     private HashMap<String, TestPackage> mTestPackageMap;
 
     enum Ints {
@@ -262,9 +265,9 @@
      * @return The binary name of the package.
      */
     public String getPackageBinaryName(String appPackageName) {
+
         for (TestPackage pkg : mTestPackageMap.values()) {
-            if ((appPackageName.startsWith(pkg.getAppPackageName()))
-                    || (appPackageName.equals(pkg.getAppBinaryName()))) {
+            if (appPackageName.equals(pkg.getAppPackageName())) {
                 return pkg.getAppBinaryName();
             }
         }