Merge "Fix copying lsdumps when TARGET_ARCH == TARGET_ARCH_VARIANT."
am: 4ea2b0a8ff

Change-Id: Id8802275ac0910cc862faf3d4080447defb12796