am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread

Merge commit '5587bb7e375c17c1320918e6f473625af1f5e5ac' into gingerbread-plus-aosp

* commit '5587bb7e375c17c1320918e6f473625af1f5e5ac':
  Interleave the audio and video by default