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

Change-Id: Iecec4379dd16ef1e74442ff5646e784a18eb6616