Merge "macOS build fix: no off64_t on darwin." into rvc-dev am: acc1a1b5de

Change-Id: I61188ed6b3a128922efad2ceb9ec01ad7b9fc37f