Merge commit 'f14208e0' into remote

Conflicts:
	include/gui/BufferQueueCore.h
	include/gui/BufferQueueProducer.h
	include/gui/IGraphicBufferProducer.h
	include/gui/Surface.h
	include/private/gui/LayerState.h
	libs/gui/IGraphicBufferProducer.cpp
	services/surfaceflinger/DisplayDevice.h
	services/surfaceflinger/DisplayHardware/HWC2.h
	services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h
	services/surfaceflinger/SurfaceFlinger_hwc1.cpp

Change-Id: Ia0321a207080bee3697ac2f64012d3b2b13df56f