Fix compiler warning: redefinition in extendedcommands.c

ITEM_APPLY_SDCARD is already defined in recovery_ui.h, fortunately
also as 1.

This suggestion comes from Phil3759.

Change-Id: I9ac370ca9640d61b6b96f60954d35f7aa458d75b
Merge "Fix compiler warning: redefinition in extendedcommands.c" into cm-10.1
move "install zip from sideload" to installation submenu

* Also includes the below commit:

fix installation from internal sdcard

bug introduced in previous commit

Change-Id: If41d409801e9a58df9515ac783bf503f80909d3e

* I've done some minor changes to the original commit,
  which includes but is not limited to moving the
  "install zip from sideload" above "/sdcard/update.zip".

Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
Change-Id: I27a763a0d41085719a6c7d9c3b8a20fbcae4b072
Merge branch 'cm-10.1' of github.com:CyanogenMod/android_bootable_recovery into cm-10.1

Conflicts:
	extendedcommands.c

Change-Id: Ieef8aeface2ee130fb66d790331cde531e52e3a5