Reorganize skia dependencies