am 4bcaeeec: am 6258db10: Merge "Enable AAC 5.1 output Bug:7099812" into jb-mr1-dev

* commit '4bcaeeec4aad0758c03d8a4e6a782c66b7d3691e':
  Enable AAC 5.1 output Bug:7099812