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

Change-Id: Ieb65b25e22b70282198e8657f495bb504a3d0b47