Misc updated from CyanogenMod thanks guys

This "may" have cleared up the kernel header dependency issues
Not sure just yet, but looks promising

Change-Id: Idc7740484aac808536d7296c14763970839c3b05

Conflicts:
	core/envsetup.mk