BUG=skia:2272

Change-Id: I29540e009c41a1638e1a0399950621abbbbf2904
Reviewed-on: https://chromium-review.googlesource.com/201839Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>