Merge "Add conic support for Path#approximate" into oc-dev am: ebd44d0076
am: a1e500ebf4

Change-Id: I2e4a6b53332fb746df83cda46104fe5206289519