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

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