Add recovery option

Conflicts:
	aosp_c6833.mk
Fix Build errors