Merge "Fix erroneous self deletion on SkImage creation failure"