Duplicate Media cleanup

Clean duplicate notifications and ringtones.
JIRA : https://jira.cyanogenmod.org/browse/CYAN-292

Change-Id: Icab24ca455891c2347fd521e4d8c804cb024c51f
Option to use volume keys to control media volume anytime (2/2)

See Settings part for description

Change-Id: I78d26b0bd41f5b58514ae9c68208a8c950396823
Merge "Option to use volume keys to control media volume anytime (2/2)" into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1