Merge "stagefright: rtsp: handle overflow in jitter calculation" into main