Merge "Use a mini version of libskia in renderengine" into sc-dev