Revert "Adam's audiowrappers into official cm"

This reverts commit ea6c49e8b482baca4f195b16681fc999488fce7e.