Merge "librank: 64-bit compile issues"