Merge "Fix ShapeDrawable mutate, add clone() support to ArcShape, OvalShape"