Merge remote-tracking branch 'remotes/cm/cm-10.1' into cm-10.1

Conflicts:
	Android.mk
	common.h
	default_recovery_ui.c
	extendedcommands.c
	recovery_ui.h
	roots.c
	samsung_recovery.c
	su/Android.mk
	ui.c
	utilities/Android.mk