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

Change-Id: I8722cd31ad86319d1091b7a9d8481e32fcd4304f