am 0dc8e0fc: am b5635a6f: Merge "Add output channel index mask to USB hal" into mnc-dev

* commit '0dc8e0fcb739d5c48485a43ca53027fe04d22e8c':
  Add output channel index mask to USB hal