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

Change-Id: I2464d4048f99fe2bab32d227440b0c2350c2e3bd