M58 cherry-pick: Re-enable code accidently disabled for testing

NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true

Change-Id: I6d7b9aa7afe101d287e32340f6db88d7eed5e662
Reviewed-on: https://skia-review.googlesource.com/9143
Reviewed-by: Brian Salomon <bsalomon@google.com>
1 file changed