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

Change-Id: I743efe4fc79189b2377a7a5dc58f7214e737998f