Merge "Canonicalize default ringtones." into qt-dev
am: db44ba1e85

Change-Id: I45bad18191fe6de5a648667fdc253aaac4ecd465