Revert[4] "move some public headers into private"

This reverts commit 9cdcabefa33d49febfdb45e388e762b4dee8dd6f.

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/1291613007
11 files changed