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

Change-Id: Ifc5033fbb595a672a29539599e39ac7e56c62d50