Use PA's merge of SurfaceComposerClient

really fixes the error

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