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

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