Merge changes Id163902d,I44f837e8,I11131e3f

* changes:
  Remove AUDIO_CHANNEL_OUT_SURROUND
  Add AUDIO_CHANNEL_OUT_5POINT1_SIDE and AUDIO_CHANNEL_OUT_QUAD_SIDE
  Rename AUDIO_CHANNEL_OUT_QUAD and AUDIO_CHANNEL_OUT_5POINT1