fix audio?
Revert "Reorg makefiles, add boolean for beats+bravia inclusion"

This reverts commit 30eb28a817c9fed54345018a737705ede0334a51