Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc
am: 3fb9e5b7cb

Change-Id: Ibcb0e44db0ff0da658af399522266606171b6a2e