Merge "audiohal: Fix legacy shim compilation"