Merge change 6797

* changes:
  rename libsgl/libcorecg to libskia