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

Change-Id: I5cedd6d7fa82bb7f24c005cb656184c3b2a7ff03