add changes to build falcon

Change-Id: If7f42372dd335e2686f229e041fb8cc547b3b80c

Conflicts:
	include/gui/SurfaceComposerClient.h
	libs/gui/Android.mk
	libs/gui/SurfaceComposerClient.cpp
	libs/ui/GraphicBufferAllocator.cpp
	opengl/libs/EGL/eglApi.cpp
	services/surfaceflinger/Android.mk
	services/surfaceflinger/DisplayHardware/HWComposer.cpp
	services/surfaceflinger/SurfaceFlinger.cpp