Remove global Skia includes and associated shortcuts.

bug:13225538
Change-Id: I7deff74f5c0cd7b6ad0e120ffbc378c5eb8d75ee
2 files changed