Merge branch 'cm11.0-2.6.32' of https://github.com/Quarx2k/android_device_moto_jordan-common into cm11.0-2.6.32

Conflicts:
	bootmenu/binary/logwrapper
	bootmenu/bootmenu.mk
	bootmenu/script/2nd-boot.sh
	bootmenu/script/recovery.sh
delete splashmenu second copy
experiment: use /dev/mmcblk0p2 for root rather than internal storage. Boots.

Change-Id: I432eaf2bc27ee5b0ecb1c80b6b98b9d474ac075e
Merge branch 'root-on-mmcblk0p2' of https://github.com/pipcet/android_device_moto_jordan-common into root-on-mmcblk0p2

Conflicts:
	releasetools/jordan-common_ota_from_target_files.py