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

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