Merge change 26329 into eclair

* changes:
  Distinguish jar folders and jar files in ApkBuilder script

tools/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java

@@ -133,7 +133,12 @@ public final class ApkBuilderImpl {
                     throw new WrongOptionException("Missing value for -rj");
                 }
 
+                File f = new File(args[index]);
+                if (f.isDirectory()) {
                     processJarFolder(args[index++], resourcesJars);
+                } else if (f.isFile()) {
+                    processJarFile(args[index++], resourcesJars);
+                }
             } else if ("-nf".equals(argument)) {
                 // quick check on the next argument.
                 if (index == args.length) {