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

This reverts commit 4cf9e7e14797f87f08b2078fa1afaf731cbf8f52.

BUG=skia:
TBR=
NOTRY=True

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