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

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