Merge "[includes] Fix more references to SkRRect"