Merge "Limit mp4 atom size to something reasonable" into nyc-mr1-dev am: 08e1f41731 am: d8338dd2d1
am: 6b647eefdb

Change-Id: Id1bead268405ffe4a890f42382601dbab837c0a1