manual bench rebase after f757fd3

R=robertphillips@google.com
TBR=robertphillips@google.com

Bypassing trybots:
NOTRY=true

Author: fmalita@chromium.org

Review URL: https://codereview.chromium.org/293093007

git-svn-id: http://skia.googlecode.com/svn/trunk@14873 2bbb7eff-a529-9590-31e7-b0007b416f81
9 files changed