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

Change-Id: I388a6676ffbc8b575ef90994d959a37d1f05b208