Merge "Use SurfaceControl.screenshot() instead of screencap for screenshots." into nyc-mr1-dev am: f7ac45a33b
am: edbb5d5612

Change-Id: I92825faf69ab77463065e48c85a19d01e04f9c8a