track local skia

reorganize manifest a little