updates
Fix conflicts
Merge branch 'master' of github.com:jgh-/VideoCore into audioMixerFix
fix build