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