Revert "Fetch aosp skia repo to avoid conflicts and bugs"

This reverts commit b32848a5c627a1789e4309095c92b5c712530742.