Revert "Revert "Adam's audiowrappers into official cm""

This reverts commit 11b78105fb110263997e43e79c6a67218d98c465.