Merge "Fix HOST_PREFER_32_BITS tests"