Merge "Enable AAC 5.1 output Bug:7099812" into jb-mr1-dev