Use Canvas::captureCanvasState() am: 3c0c39a4f6
am: f9a9dfd6c5

Change-Id: I70d60eeb0efc9d13e3baa52194071a66840d1239