Merge  'android-4.3_r2.1' into jb-mr2

Conflicts:
	include/gui/BufferQueue.h
	include/gui/IGraphicBufferProducer.h
	include/gui/SurfaceTextureClient.h
	include/media/openmax/OMX_IVCommon.h
	include/private/gui/SyncFeatures.h
	libs/gui/Android.mk
	libs/gui/SurfaceComposerClient.cpp
	libs/gui/SurfaceTextureClient.cpp
	libs/ui/GraphicBufferAllocator.cpp
	services/surfaceflinger/DisplayDevice.cpp
	services/surfaceflinger/DisplayHardware/HWComposer.cpp
	services/surfaceflinger/SurfaceFlinger.cpp

Change-Id: I428e40bff3cead2393aece12e17aee0de5edeba9