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

Change-Id: Ic5aaaea685e0f117d51af46b415e68580537af2b