Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev