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

Change-Id: Iaed34008782d119a4439a27d22d5b796917fc0b9