Merge "Use int32_t instead of off_t when necessary." am: cf6eb0a136 am: 5c38332e6b
am: 088db676d6

Change-Id: I10336a928394e7f646cb14fde9eb9bae0b9e2452