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

Change-Id: Ifb5ea273af0fcde967da148b205577f01e9d2025