Merge "Revive geometry shaders" into master-skia

https://skia.googlesource.com/skia/+/276cc4113a6440b842c0dacb6d668ee3b45a3b7d

Change-Id: I638937c8ff67b04a978ac6dc75a2b14699fe6500