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

Conflicts:
	include/gui/SurfaceComposerClient.h
	libs/gui/SurfaceComposerClient.cpp

Change-Id: I34101831dafa8da390a9b0fe14e612ea6a88ef5d