Merge "Remove unnecessary Skia include"