revert alarm changes

Change-Id: I8575460b1b58a85545b888919df56268a072b259
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1

Conflicts:
	kernel-headers/linux/android_alarm.h