am 3aad8c38: Merge "Fix an issue where the track duration does not include the...

am 3aad8c38: Merge "Fix an issue where the track duration does not include the last sample duration" into gingerbread

Merge commit '3aad8c38520956708e51882f3fad63a7a217e8e4' into gingerbread-plus-aosp

* commit '3aad8c38520956708e51882f3fad63a7a217e8e4':
  Fix an issue where the track duration does not include the last sample duration