Merge "Update USB alsa to only use channel index masks for multichannel" into mnc-dev