Merge "cm: Add default alarm tone" into gingerbread