am b26105c0: am f53c36c6: Merge "Respect channel mask in ACodec and NuPlayer." into jb-dev

* commit 'b26105c04508f32528f59dd66b78d1e0858fe90e':
  Respect channel mask in ACodec and NuPlayer.