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

Change-Id: Ia7cf52c5f051ac002c6da073afa53ebcf0966b0a