galaxys2: loop ringtones, cleanup unused props

Change-Id: Ieec8981f495aacb6e6ce14a52a72935296b55de3
Merge branch 'cm-10.1' into martincz