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

Change-Id: Ia94cb17a7b2c5ad333c0b8d4034710d0d600aab3