Merge "MPEG4Write mdhd duration overflow after recording for 15 hours" am: 98d1217d58
am: 6afe508bb2

Change-Id: Ib47fdde7f7b25a09bc76d9b43a937986ce9936e1