Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  fix usb audio for devices with more than 8 channels

Change-Id: If40603d794ad6334c4c6006566d46d9d0d0d0ace