Merge "Revert "Ensuring builds compile for both 32 bit and 64 bit targets."" into nyc-dev