Use CM's SurfaceComposerClient

Fixes bad merge

Change-Id: I1dae95a4be1e6c87f1d32fad2c46feffb9990145
Signed-off-by: Evan Anderson <evan1124@gmail.com>