Merge "Better logs for "Unable to generate SkImage/SkSurface"" into udc-dev