Revert "Merge remote branch 'cros/upstream' into tempbranch2"

client/deps/mysql/mysql.py

Index: client/deps/mysql/mysql.py
diff --git a/client/deps/mysql/mysql.py b/client/deps/mysql/mysql.py
index 2328d30e5c94fb8e4b6ea3c8ac4f7217a271c822..d8f00373f96dd6a5448fadeb37c45e964a0faba8 100755
--- a/client/deps/mysql/mysql.py
+++ b/client/deps/mysql/mysql.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import os
+import common
 from autotest_lib.client.bin import utils
 
 version = 3
@@ -11,10 +12,10 @@ def setup(tarball, topdir):
         utils.get_file('http://mirror.x10.com/mirror/mysql/Downloads/MySQL-5.0/mysql-5.0.45.tar.gz', tarball)
     utils.extract_tarball_to_dir(tarball, 'src')
     os.chdir(srcdir)
-    utils.configure('--prefix=%s/mysql --enable-thread-safe-client' \
+    utils.system ('./configure --prefix=%s/mysql --enable-thread-safe-client' \
                     % topdir)
-    utils.make('-j %d' % utils.count_cpus())
-    utils.make('install')
+    utils.system('make -j %d' % utils.count_cpus())
+    utils.system('make install')
 
     #
     # MySQL doesn't create this directory on it's own.