Merge "Support TARGET_ARCH=64 with no 2ND_TARGET_ARCH."