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

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