Upstream Autotest merge.

As titled, a merge up to 93fc426ca133e775eb495f34d138fc57d92fb55e.

- Removes a bunch of deprecated code.
- Moves several private utilities into the private repo.
- Couple changes ported upstream and resynced.

BUG=None
TEST=In progress... will spin up new Autotest server and use
run_remote_tests for bvt, regression, smoke.

Change-Id: Id3e2ad529bb7b05f148e5d98aea46bb9ea828200
Reviewed-on: http://gerrit.chromium.org/gerrit/3350
Tested-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
diff --git a/utils/compile_gwt_clients.py b/utils/compile_gwt_clients.py
index 67108bc..e9aa86a 100755
--- a/utils/compile_gwt_clients.py
+++ b/utils/compile_gwt_clients.py
@@ -15,9 +15,9 @@
 
 _COMPILE_LINE = ('java  -Xmx512M '
                  '-cp "%(app_dir)s/src:%(app_dir)s/bin:%(gwt_dir)s/gwt-user.jar'
-                 ':%(gwt_dir)s/gwt-dev.jar:%(gwt_dir)s/gwt-incubator.jar" '
-                 '-Djava.awt.headless=true com.google.gwt.dev.Compiler '
-                 '-war "%(compile_dir)s" %(extra_args)s %(project_client)s')
+                 ':%(gwt_dir)s/gwt-dev.jar" -Djava.awt.headless=true '
+                 'com.google.gwt.dev.Compiler -war "%(compile_dir)s" '
+                 '%(extra_args)s %(project_client)s')
 
 class CompileClientsLoggingConfig(logging_config.LoggingConfig):
     def configure_logging(self, results_dir=None, verbose=False):