http://skbug.com/3130 step 1 (to fix chromium roll)

BUG=skia:3130
TBR=djsollen@google.com, bsalomon@google.com

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