Vivo: Minor cleanup
Vivo: audio_policy: add 48kHz to primary output

Maybe fixes this:
W/AudioTrack( 1890): AUDIO_OUTPUT_FLAG_FAST denied by client due to mismatching sample rate (48000 vs 44100) (mustaavalkosta)
Vivo: Moar cleanup
Merge remote-tracking branch 'szezso/cm-11.0-ION' into cm-11.0-ION