Merge "DSPManager: Add xhdpi launcher icon, cleanup others a bit." into cm-10.2