Merge "audio: Update common types to better match legacy structs"