update for jellybean (recovery)

Conflicts:
	Android.mk
	yaffs2/utils/mkyaffs2image.c

Change-Id: Ia548684fe4412a983d92e0af616e9dbaef2528b4