Use SurfaceControl.screenshot() instead of screencap for screenshots.
am: aba9743643

Change-Id: Ie6761383247cd90d586b0b29866f49c8a7787282