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

Change-Id: Ib214c96f2d316bdd05c200e01ecfc1d9ff9fdba1