Merge "Add support for ovals and stroked rectangles." into honeycomb