am 97f294f5: am 5ccd64b4: am 80688be6: am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev
am 97f294f5: am 5ccd64b4: am 80688be6: am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev

* commit '97f294f5a65fb7bc2a87acac56db7b576ca5e5de':
  Consider channel index masks when calculating channel counts.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base