Merge "Always enable multichannel AAC decoding" into nyc-dev am: c8bc097
am: 1e577f3

* commit '1e577f360e33d1f4da3c93ef267668486248897f':
  Always enable multichannel AAC decoding

Change-Id: I25065af5e0bf357ab167cd8fdb6508237d460b97