Add kernel-headers/linux/android_alarm.h to accomodate the latest 3.0 kernel header change.
Merge branch 'p-jb-release' into p-jb-release-linaro