Merge "[skia] enable skia by default" into pi-dev
am: 0a923373cf

Change-Id: I3f48c34f79f3f32c8aa2bd6af492a0936043249a