am 4cfcfd53: am 0fcc2977: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev

* commit '4cfcfd53fbe1764dd284c308b9f15373d1d1cd30':
  Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457