Merge "Remove direct dependency of external/skia on frameworks/native"