Merge "Fixes related to typo in audio.h"