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

Change-Id: I0727b58843540b89c4e4668c1e7f2168d5fc7058