Moved android_external_skia upstream