Revert "move some public headers into private"

This reverts commit eedf0fb20489bc6c3706539dd6ab499f41cbe048.

BUG=skia:
TBR=
NOTRY=True

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