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

Conflicts:
	libs/gui/Android.mk
	services/surfaceflinger/Android.mk