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

This reverts commit fb28cd2b13d76c324570341e1155aaadc1b532b6.

BUG=skia:
TBR=

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