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

Conflicts:
	services/surfaceflinger/Layer.cpp