Merge "Fix 64bit build."