Reland "fix nextContour bug"

This reverts commit 0a86820f2fe3b62f2a5ac2917a1ef342dbe53722.

Reason for revert: fix has landed in CTS

Original change's description:
> Revert "fix nextContour bug"
> 
> This reverts commit 473f69276f1854db80e094cc4af091f7f8a5b00b.
> 
> Reason for revert: a CTS test PathMeasureTest.android.graphics.cts.PathMeasureTest.testNextContour is failing
> 
> Original change's description:
> > fix nextContour bug
> > 
> > Calling nextContour() needs to ensure that we've already measured the "current" one.
> > 
> > Bug: skia:
> > Change-Id: I501c26d0b068028d67103888f06ec89125a5407a
> > Reviewed-on: https://skia-review.googlesource.com/114692
> > Reviewed-by: Cary Clark <caryclark@google.com>
> > Commit-Queue: Mike Reed <reed@google.com>
> 
> TBR=caryclark@google.com,reed@google.com
> 
> Change-Id: I7f1e08651dfe73c02158b209dc28af2b174e246f
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/114823
> Reviewed-by: Stan Iliev <stani@google.com>
> Commit-Queue: Stan Iliev <stani@google.com>

TBR=caryclark@google.com,reed@google.com,stani@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: skia:
Change-Id: I0fd61473ef0df62722cf6c6b86f1277f580e4ab1
Reviewed-on: https://skia-review.googlesource.com/115340
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
2 files changed