Merge "Purge the android_alarm headers." am: 6d298ffd80 am: 125808b923 am: c6b0df50d2
am: d6dfd8038a

Change-Id: I19ede7ce6d51daf3e0288a3529217707ae090c95