Merge "More consistent use of 64-bit build variable."