CyanogenMod updates

Conflicts:
	AndroidKernel.mk

Change-Id: I9bb95062e9e210ed8546dbf88ba7f46d24fbf224