Merge "Add floats-only drawRoundRect to Canvas"