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

Change-Id: I7abd1a47726aa5f34c56e576c150cce5843817ed