Merge "remove a dependency of surfaceflinger on libskia"