merge 4.2 aosp into slim

ATTENTION: HWCOMPOSER.CPP reseted to aosp one temporaly
till surfaceflinger conflicts for qcom device are resolved

Conflicts:
	cmds/dumpstate/dumpstate.c
	include/gui/BufferQueue.h
	include/gui/GLConsumer.h
	include/gui/IGraphicBufferProducer.h
	include/gui/SurfaceTextureClient.h
	include/media/openmax/OMX_IVCommon.h
	include/utils/LinearAllocator.h
	include/utils/Trace.h
	libs/gui/Android.mk
	libs/gui/GLConsumer.cpp
	libs/gui/SurfaceComposerClient.cpp
	libs/gui/SurfaceTextureClient.cpp
	libs/utils/Trace.cpp
	opengl/include/EGL/eglext.h
	opengl/libs/EGL/egl.cpp
	opengl/libs/EGL/eglApi.cpp
	services/surfaceflinger/DisplayDevice.cpp
	services/surfaceflinger/DisplayHardware/HWComposer.cpp
	services/surfaceflinger/DisplayHardware/HWComposer.h
	services/surfaceflinger/Layer.cpp
	services/surfaceflinger/Layer.h
	services/surfaceflinger/LayerBase.cpp
	services/surfaceflinger/LayerBase.h
	services/surfaceflinger/SurfaceFlinger.cpp

Change-Id: Icb9551c856177efb5193fca1d8f20e8015eef9a1