Merge "Move RINGTONE_PICKER to handle external storage." into jb-dev