Frameworks: Clean up Audio a bit

Change-Id: I83d8bdf67593f21cc68a920f32849b9423c0319e