Merge remote branch 'cros/upstream' into tempbranch3

Merge to trunk@4817

BUG=
TEST=

Review URL: http://codereview.chromium.org/3554003

Change-Id: I83376bc7d28104ec2678e157eadbe7df7c05c0e0
diff --git a/client/tests/sysbench/sysbench.py b/client/tests/sysbench/sysbench.py
index 1db0ba1..8a5400c 100644
--- a/client/tests/sysbench/sysbench.py
+++ b/client/tests/sysbench/sysbench.py
@@ -25,7 +25,7 @@
         utils.system(
             'PATH=%s/bin:$PATH ./configure --with-mysql=%s --with-pgsql'
             % (pgsql_dir, mysql_dir))
-        utils.system('make -j %d' % utils.count_cpus())
+        utils.make('-j %d' % utils.count_cpus())
 
 
     def run_once(self, db_type = 'pgsql', build = 1, \