AudioService : Cleanup

Change-Id: I69d26c436b0c2dedef6018cc629fcfb859637543