Merge "AudioService: remove dead code"