Merge pull request #2336 from birarda/audio-scaling

handle trivial case of not mixing silent audio streams
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-scaling