Merge "Use int32_t instead of off_t when necessary."
am: cf6eb0a136

Change-Id: Id68c84efd00693f3b0d11e4385a12debced4c1aa