Merge remote branch 'cros/upstream' into tempbranch2

Merged to trunk@4816.

BUG=
TEST=we will build a new autotest server instance, and keep cautotest running and then later do a cname switch.

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

Change-Id: Iee5f52f45f28f84927d6c6f9a74edc370d40288a
diff --git a/client/tests/rtc/rtc.py b/client/tests/rtc/rtc.py
index 49b2a9d..5345db1 100644
--- a/client/tests/rtc/rtc.py
+++ b/client/tests/rtc/rtc.py
@@ -8,8 +8,8 @@
 
     def setup(self):
         os.chdir(self.srcdir)
-        utils.system('make clobber')
-        utils.system('make')
+        utils.make('clobber')
+        utils.make()
 
 
     def initialize(self):