am 5793383: Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev

* commit '579338345721351313d4c3cd2a5114a0d135028d':
  Fix Tests after cherry picks. [DO NOT MERGE]

Author: deepanshu-

tools/layoutlib/.idea/runConfigurations/Create.xml

@@ -161,7 +161,7 @@ private static String getPlatformDirFromHostOut(File out) {
         if (!out.isDirectory()) {
             return null;
         }
-        File sdkDir = new File(out, "sdk" + File.separator + "sdk");
+        File sdkDir = new File(out, "sdk");
         if (!sdkDir.isDirectory()) {
             // The directory we thought that should contain the sdk is not a directory.
             return null;
@@ -283,14 +283,14 @@ public void testRendering() throws ClassNotFoundException {
     }
 
     /**
-     * Uses Theme.Material and Target sdk version as 21.
+     * Uses AppTheme and Target sdk version as 19.
      */
     private SessionParams getSessionParams(LayoutPullParser layoutParser,
             ConfigGenerator configGenerator, LayoutLibTestCallback layoutLibCallback) {
         FolderConfiguration config = configGenerator.getFolderConfig();
         ResourceResolver resourceResolver =
                 ResourceResolver.create(mProjectResources.getConfiguredResources(config),
-                        mFrameworkRepo.getConfiguredResources(config), "Theme.Material", false);
+                        mFrameworkRepo.getConfiguredResources(config), "AppTheme", true);
 
         return new SessionParams(
                 layoutParser,
@@ -300,7 +300,7 @@ private SessionParams getSessionParams(LayoutPullParser layoutParser,
                 resourceResolver,
                 layoutLibCallback,
                 0,
-                21, // TODO: Make it more configurable to run tests for various versions.
+                19, // TODO: Make it more configurable to run tests for various versions.
                 getLayoutLog());
     }