Merge "Override Auxiliary audio effect output as stereo"
am: 568085d022

Change-Id: I4f705ee2b47f30731d4f1ac46213fbcd678633a5