Merge "Add bench and gm for shapes" into master-skia

https://skia.googlesource.com/skia/+/4a6e40d9d2e0eb81e00d8b2bd20532aa28f61afb

Change-Id: I418c4dba0928e733ac80f48d7cabd31852994caf