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

Change-Id: Ib98760c806c687756adc7dbb5174c1cb47ac0b17