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

This reverts commit 25fc6d1f28e54c46689f12d3b93c2540ef45323a.

TBR=ericli@chromium.org

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

Change-Id: Ib0165b19bfdf02264f8a6a74ddf3ae74c8c0f7df
diff --git a/client/tests/netperf2/netperf2.py b/client/tests/netperf2/netperf2.py
index 179757a..b82aa5c 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.make()
+        utils.system('make')
         utils.system('sync')
 
         self.job.setup_dep(['sysstat'])