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

Change-Id: I505af1d32a67f42acb42d7849154ee2dfe398f13