merge cm10.1 into eos 4.2.1 thanks guys

Change-Id: Iafa9174b4c3c4459349384c28db39df92afcda79

Conflicts:
	init/init.c
	libcutils/Android.mk
	libcutils/android_reboot.c
	mkbootimg/mkbootimg.c
	mkbootimg/unpackbootimg.c
	rootdir/init.rc
	toolbox/Android.mk