Merge "Support channel index masks for output hal" into mnc-dev