Merge "Speaker channel swapping is conditional to audio mode" into nyc-mr1-dev
am: 09fef3caf5

Change-Id: I6bcae92653fecb662ceb8a78ba6a62167b640e6e