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

Change-Id: If2e9243a0f32e776676ef18c1933b8e2e649857c