revert humper changes

https://skia.googlesource.com/skia.git/+/24e91ba3029a3a1fb60cab3ae4e68c3c44776f25

https://skia.googlesource.com/skia.git/+/a36c78240e14aeb130a97c43f3992ea19696b929

NOTREECHECKS=true

BUG=skia:
R=caryclark@google.com, mtklein@google.com

Author: mtklein@chromium.org

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

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