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

Change-Id: Ibaec635c2b76e8aa8a4152841b4888830ad9e7db