Merge "Use channel count for CHANNEL_MASK_USE_CHANNEL_ORDER"
am: 413b0b2299

Change-Id: Id45e0113abb655afea7fa1f5ce63354ed27c1f3f