Revert "Add m7-based audio which may make the CAF audio variant work and is in general, cleaner"

Since CAF didn't work, we may as well go back to a working base

This reverts commit 6d4e715ded49fb09099b700d79408b496d2a8656.