Revert "Trimmed the branch to only the nao_audio sub directory"

This reverts commit e1e9842ec0b1a2afc2e0252e448a081e7c95f366.
Rebase from 'upstream'
Trimmed the branch to only the nao_audio sub directory