Use SurfaceControl.screenshot() instead of screencap for screenshots. am: aba9743643 am: ce61b5715d
am: 8cfc23f434  -s ours

Change-Id: I31f2aeefcc4c43d32e617ecb0cb4d66c12be9d01