Merge remote-tracking branch 'cm/cm-10.1' into gerrit

Conflicts:
	Android.mk

Change-Id: I5e07247af53e68e8f2ff31c28655f187bb5ad829
Where we're going, WE DON'T NEED KERNEL_OBJs

Change-Id: I86474096773e781633c8fc1cb822f07b1ca478f3