Merge "Remove include of private SkUtils.h file"