Revert trigger changes

BUG=skia:
NOTRY=true
R=robertphillips@google.com, bensong@google.com, jcgregorio@google.com

Author: kelvinly@google.com

Review URL: https://codereview.chromium.org/334673002
diff --git a/bench/gen_bench_expectations.py b/bench/gen_bench_expectations.py
index 674309d..a6f9605 100644
--- a/bench/gen_bench_expectations.py
+++ b/bench/gen_bench_expectations.py
@@ -46,14 +46,12 @@
   Returns:
     a list of float [lower_bound, upper_bound].
   """
-  avg = sum(benches) / len(benches)
-  squared_avg = avg ** 2
-  avg_sum_squared = sum([bench**2 for bench in benches])/len(benches)
-  std_dev = (abs(avg_sum_squared - squared_avg) + 0.0001*abs(avg**2)) ** 0.5
+  avg = sum(benches)/len(benches)
+  minimum = min(benches)
+  maximum = max(benches)
 
-  # If the results are normally distributed, 2 standard deviations
-  # captures something like ~95% of the possible range of results I think
-  return [avg - 2*std_dev, avg + 2*std_dev]
+  return [minimum - diff*RANGE_RATIO_LOWER - avg*ERR_RATIO - ERR_LB,
+          maximum + diff*RANGE_RATIO_UPPER + avg*ERR_RATIO + ERR_UB]
 
 
 def create_expectations_dict(revision_data_points, builder):