am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev
am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev

* commit 'af7748efb6cf4ecca07ab7a76b678a04387e2e40':
  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