added deedwars fixes for SurfaceComposerClient

Conflicts:
	libs/gui/SurfaceComposerClient.cpp

Change-Id: If3269c74af6e2f7502ab35c8ae398b1b4a013c0c