Merge "Expose Circle and Polygon as SystemApi"
am: ac2b27aed1

Change-Id: I1a04dfca879c9ad978b056a8703bccebcda21f39