Merge "Bring back the old CyanAlarm alarm tone" into cm-10.2