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

Change-Id: I0580baa791fa7f87f5e65a47bff20cf1d44334c2