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

This reverts commit cc1229c9d5e57b45305ba8f99ae33e92db0032bc.

BUG=skia:
TBR=

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