Use SurfaceControl.screenshot() instead of screencap for screenshots.

*** cherrypick of 8cfc23f ***

Change-Id: I5a9e7bbc5f3ae176ac5ae7209a133526992e92d4
Fixes: 30429392
2 files changed