Merge \\\"Remove dependency on android_alarm.h.\\\" am: c95e7a3014 am: 8f7223e420
am: 96d02a6c08

Change-Id: Ibb7cc1fa2c8ddeb3d0b7154f817d6c9738d079e4