Merge "Add unit test for Skia path behavior" into oc-dev am: dc3ab163d3
am: 515222acd2

Change-Id: I214885c57e77ffd8a991478c96fb70582ce43e6c