Merge \"Remove dependency on android_alarm.h.\"
am: c95e7a3014

Change-Id: I19908fa29772c89b8112e371702da6197b20465d