Revert "audio: Cleanups"

This reverts commit 07269cc3b37b952ad3d0b0044ddd53010bea57ec.
libaudio: Update from msm7x30