Merge "Stop MinikinSkia.h relying on SkRefCnt.h for <string> and <string_view>"