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

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