Merge "Add missing include for SkRRect" into sc-dev