Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread