3.2.0c

Signed-off-by: Stratos Karafotis <stratosk@semaphore.gr>
3.2.0v

Signed-off-by: Stratos Karafotis <stratosk@semaphore.gr>
Merge remote-tracking branch 'stratos/jb-4.3' into jb-4.3

Conflicts:
	jb_combo_c/files/init
	jb_combo_c/ics_rec_init/default.prop
	jb_combo_c/ics_rec_init/etc/recovery.fstab
	jb_combo_c/ics_rec_init/fstab.aries
	jb_combo_c/ics_rec_init/init.rc
	jb_combo_c/ics_rec_init/init.recovery.aries.rc
	jb_combo_c/ics_rec_init/res/keys
	jb_combo_c/ics_rec_init/sbin/recovery
	jb_combo_c/ics_rec_init/sbin/su.recovery
	jb_combo_v/files/init
	jb_combo_v/ics_rec_init/default.prop
	jb_combo_v/ics_rec_init/etc/recovery.fstab
	jb_combo_v/ics_rec_init/fstab.aries
	jb_combo_v/ics_rec_init/init.rc
	jb_combo_v/ics_rec_init/init.recovery.aries.rc
	jb_combo_v/ics_rec_init/res/keys
	jb_combo_v/ics_rec_init/sbin/recovery
	jb_combo_v/ics_rec_init/sbin/su.recovery

Change-Id: Ie61ffcae566043b05b4e95cfa9469a2c647586f2