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

This reverts commit d12cabd304b0791b6abef53eb2b58806e5558947.