More audio fixes.
Merge branch 'moonshot' of https://github.com/ZappoMan/hifi into moonshot
More audio fixes.