m7-common: Audio configuration cleanup

Change-Id: I04cfc1de1423d52b7e6639b08b646090adfcb820