add changes to build falcon

Change-Id: If7f42372dd335e2686f229e041fb8cc547b3b80c

Conflicts:
	services/surfaceflinger/DisplayHardware/HWComposer.cpp
	services/surfaceflinger/SurfaceFlinger.cpp