Merge "libbase: a slightly cleaner solution to libbase's `off64_t` problem."