Merge remote-tracking branch 'CM/cm-10.2' into HEAD

Conflicts:
	cmds/dumpstate/utils.c
	include/gui/BufferQueue.h
	include/gui/IGraphicBufferProducer.h
	include/gui/SurfaceTextureClient.h
	include/media/openmax/OMX_IVCommon.h
	libs/gui/Android.mk
	libs/gui/IGraphicBufferProducer.cpp
	libs/gui/SurfaceComposerClient.cpp
	libs/gui/SurfaceTextureClient.cpp
	libs/ui/GraphicBufferAllocator.cpp
	services/surfaceflinger/DisplayDevice.cpp
	services/surfaceflinger/DisplayHardware/HWComposer.cpp
	services/surfaceflinger/Layer.cpp
	services/surfaceflinger/Layer.h
	services/surfaceflinger/LayerBase.cpp
	services/surfaceflinger/SurfaceFlinger.cpp

Change-Id: I62604c78a89573a4f6ef32eea15b1c06251279fa
Fix android.mk

Change-Id: I7c27cc8d0a06abfe039483a0c8c87eb5c3332b56