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

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