Merge "Limit mp4 atom size to something reasonable" into nyc-mr1-dev