Merge "Fix copying lsdumps when TARGET_ARCH == TARGET_ARCH_VARIANT."