Reorg makefiles, add boolean for beats+bravia inclusion

Change-Id: I14d71899632bb2039bd23d10e414b8e5f84591d8