Fix what I just broke

Fix what I just broke

BUG=skia:
NOTRY=true
TBR=bensong@google.com

Committed: https://skia.googlesource.com/skia/+/5a220a1f479f02676bc1a92fea0b2cc2556ec4f9

[kelvinly, 2014-06-10 22:28:31]

Left in merge marking stuff in the last commit, using this one to fix that

[kelvinly, 2014-06-10 22:28:33]

The CQ bit was checked by kelvinly@google.com

[commit-bot: I haz the power, 2014-06-10 22:29:36]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/kelvinly@google.com/328883003/1

[commit-bot: I haz the power, 2014-06-10 22:29:37]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-10 22:29:38]

Failed to apply patch for bench/gen_bench_expectations.py:
While running git apply --index -p1;
  error: patch failed: bench/gen_bench_expectations.py:48
  error: bench/gen_bench_expectations.py: patch does not apply

Patch:       bench/gen_bench_expectations.py
Index: bench/gen_bench_expectations.py
diff --git a/bench/gen_bench_expectations.py b/bench/gen_bench_expectations.py
index
af0e46509163136e5514b70e5b0091ba0235acc3..1634914718f2237e6eb1f9d9ef3700bb6a386e27
100644
--- a/bench/gen_bench_expectations.py
+++ b/bench/gen_bench_expectations.py
@@ -48,8 +48,8 @@ def compute_ranges(benches):
   """
   avg = sum(benches) / len(benches)
   squared_avg = avg ** 2
-  avg_squared = sum([bench**2 for bench in benches])/len(benches)
-  std_dev = (avg_squared - squared_avg) ** 0.5
+  avg_sum_squared = sum([bench**2 for bench in benches])/len(benches)
+  std_dev = (abs(avg_sum_squared - squared_avg) + 0.05*abs(avg)) ** 0.5
 
   # If the results are normally distributed, 2 standard deviations
   # captures something like ~95% of the possible range of results I think

[kelvinly, 2014-06-10 22:32:06]

The CQ bit was checked by kelvinly@google.com

[commit-bot: I haz the power, 2014-06-10 22:32:37]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/kelvinly@google.com/328883003/20001

[commit-bot: I haz the power, 2014-06-10 22:32:49]

Change committed as 5a220a1f479f02676bc1a92fea0b2cc2556ec4f9