Merge "Proper equals/hashCode impls in Rect and RectF"