Merge "Use long instead of int for file offsets" into jb-dev