Merge "Add definition of off64_t for mac os builds" am: 3e0b594619
am: 0b60b181c4

Change-Id: If6e297d32275dd20c9f3ec0f7da45c3715154c54