Merge "Limit mp4 atom size to something reasonable" into klp-dev am:...

Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59 am: 3fb9e5b7 am: 085a4173 am: b617cbed am: f5b8755f am: 7d5774b0 am: 9668a101 am: b87e75a6 am: 61b8e13f am: f160b478 am: 04180a9f am: 890b0db1 am: 1dd2c8b1
am: 9304fc77

Change-Id: I80fda11292270b78531b14b089b7b127298fe2c1