AI 146001: am: CL 145844 am: CL 145394 Fix 'android create project': it was swapping activity and package names (bug #1781137)

Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146001

tools/sdkmanager/app/src/com/android/sdkmanager/Main.java

@@ -279,8 +279,8 @@ class Main {
 
         creator.createProject(projectDir,
                 projectName,
-                activityName,
                 packageName,
+                activityName,
                 target,
                 false /* isTestProject*/);
     }