Merge "Remove dependency on android_alarm.h."