Merge "Add SkiaCanvas::captureCanvasState()" into oc-dev am: 59fa17a9d4
am: d6b4c56a91  -s ours

Change-Id: Icabef048a4bba724ee674bdf80685397755c0d0b