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/netperf2/netperf2.py b/client/tests/netperf2/netperf2.py
index b82aa5c..179757a 100644
--- a/client/tests/netperf2/netperf2.py
+++ b/client/tests/netperf2/netperf2.py
@@ -18,7 +18,7 @@
 
         utils.system('patch -p0 < ../wait_before_data.patch')
         utils.configure()
-        utils.system('make')
+        utils.make()
         utils.system('sync')
 
         self.job.setup_dep(['sysstat'])