Merge "Fix audio broken for sdk builds."