Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am: 3fb9e5b7cb am: 085a4173eb am: b617cbed2d am: f5b8755f18 am: 7d5774b0ea am: 9668a1012a
am: b87e75a6bf

Change-Id: I2d9dbc50a4d2b8fe09e836f1e2395fb660cd9d87