Add Skia includes where needed.

A proposed change in Skia will forward declare more classes in more
headers. As a result, some Skia headers need to be explicitly
included.

Change-Id: I577095afde9de0e36b8f904aee91979b01e30726