Merge "Remove unnecessary (private) Skia includes"