am fa3dca7: AI 148142: CTS: added @BrokenTest tag for failed cases in Co

Merge commit 'fa3dca790231da46f5327aa6a07c64f9e205dccd' into donut

* commit 'fa3dca790231da46f5327aa6a07c64f9e205dccd':
  AI 148142: CTS: added @BrokenTest tag for failed cases in ContextWrapperTest.
diff --git a/tools/host/src/com/android/cts/HostConfig.java b/tools/host/src/com/android/cts/HostConfig.java
index 11f7488..aeeae96 100644
--- a/tools/host/src/com/android/cts/HostConfig.java
+++ b/tools/host/src/com/android/cts/HostConfig.java
@@ -66,9 +66,6 @@
     private CaseRepository mCaseRepos;
     private Repository mResultRepos;
     private PlanRepository mPlanRepos;
-
-    // key: app package name
-    // value: TestPackage
     private HashMap<String, TestPackage> mTestPackageMap;
     
     enum Ints {
@@ -253,9 +250,9 @@
      * @return The binary name of the package.
      */
     public String getPackageBinaryName(String appPackageName) {
-
         for (TestPackage pkg : mTestPackageMap.values()) {
-            if (appPackageName.equals(pkg.getAppPackageName())) {
+            if ((appPackageName.startsWith(pkg.getAppPackageName()))
+                    || (appPackageName.equals(pkg.getAppBinaryName()))) {
                 return pkg.getAppBinaryName();
             }
         }