Merge "Fix LP64 build for minadbd."