Merge remote-tracking branch 'slim/kk4.4-caf' into vaosp

Conflicts:
	include/gui/Surface.h
	libs/gui/Surface.cpp
	services/surfaceflinger/SurfaceFlinger.h