Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	services/surfaceflinger/SurfaceFlinger.cpp

Change-Id: I66a4c90d3b33f697f31a15c06008093dc76cd9e7