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

Change-Id: I4d33ca2e468a2a98b61400a4e3f5de08daf72e29