Merge changes Ic5f780de,I3f963307

* changes:
  Support audio-haptic coupled playback.
  Add buffer provider that can adjust channels.