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

Change-Id: I7fd6c49a94b557772f3f2d9d2f751ef2fd42eee8