Merge "Remove bogus SkASSERT"