Merge "MPEG4Writer:RaceCondition updating mStartTimestampUs"