Merge "combine vertical overlapping edges" into master-skia

https://skia.googlesource.com/skia/+/afd25f703d9bbc9cd80b03b63b30abd14db4911d

Change-Id: I93f104edb10d9809fc4c091690f2362859b03e15