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

Change-Id: I8c2b7167e67b4f233796b5327bc54a9987339224