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

Change-Id: I4cfae565f7186e2c7b4142d4ba0177e130300386