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

client/deps/systemtap/systemtap.py

Index: client/deps/systemtap/systemtap.py
diff --git a/client/deps/systemtap/systemtap.py b/client/deps/systemtap/systemtap.py
index 4504dfab216e2f7f8bfe5a70194d30493b0ca1ec..f6c34d74e05020e69f6b70f757385cfaaac50ab4 100755
--- a/client/deps/systemtap/systemtap.py
+++ b/client/deps/systemtap/systemtap.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import os
+import common
 import shutil
 from autotest_lib.client.bin import utils
 
@@ -11,10 +12,10 @@ def setup(topdir):
 
     os.chdir(srcdir)
 
-    utils.configure('--with-elfutils=elfutils ' \
-                    '--prefix=%s/systemtap' % topdir)
-    utils.make('-j %d' % utils.count_cpus())
-    utils.make('install')
+    utils.system('./configure --with-elfutils=elfutils ' \
+                 '--prefix=%s/systemtap' % topdir)
+    utils.system('make -j %d' % utils.count_cpus())
+    utils.system('make install')
 
     os.chdir(topdir)