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/iozone/iozone.py b/client/tests/iozone/iozone.py
index 79178e1..4fbec26 100755
--- a/client/tests/iozone/iozone.py
+++ b/client/tests/iozone/iozone.py
@@ -37,13 +37,13 @@
 
         arch = utils.get_current_kernel_arch()
         if (arch == 'ppc'):
-            utils.system('make linux-powerpc')
+            utils.make('linux-powerpc')
         elif (arch == 'ppc64'):
-            utils.system('make linux-powerpc64')
+            utils.make('linux-powerpc64')
         elif (arch == 'x86_64'):
-            utils.system('make linux-AMD64')
+            utils.make('linux-AMD64')
         else:
-            utils.system('make linux')
+            utils.make('linux')
 
 
     def run_once(self, dir=None, args=None):