cleanup and fix AOKP sound settings

Change-Id: Icc1f446d85656bd53f5363ca6cc84ce0bcf27f3b
wakelock blocker: (2/2)

Change-Id: I36211f2a696043289f700459241301200e0d8498