Merge "Add definition of off64_t for mac os builds"