Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

This reverts commit 7edb30498d75a29a3287fe07070f2b51a116c5d4.

TEST=Built for tegra2_seaboard
BUG=10756

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

Change-Id: Ifcd1a2279f5a62b99552a8f961c1430889a3a928
diff --git a/client/tests/hackbench/hackbench.py b/client/tests/hackbench/hackbench.py
index 15e93d7..5861888 100644
--- a/client/tests/hackbench/hackbench.py
+++ b/client/tests/hackbench/hackbench.py
@@ -18,9 +18,9 @@
     def setup(self):
         os.chdir(self.srcdir)
         if 'CC' in os.environ:
-            cc = '$CC'
+          cc = '$CC'
         else:
-            cc = 'cc'
+          cc = 'cc'
         utils.system('%s -lpthread hackbench.c -o hackbench' % cc)