Merge "Fix 64 bit build"