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

Change-Id: Id8f4fab9c57d2621987b93a0755caad3bcef6aab