More changes to bring together path / geo procs

BUG=skia:

Review URL: https://codereview.chromium.org/820783005
27 files changed