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

* commit 'd182046ee67c1196e52b74dc9f3f89dcb816785d':
  Add support for ovals and stroked rectangles.