Merge "Use uint32_t for NAL offset and size"