Merge "Path.native_trim should return long, not int."