Merge "Remove arch variants from ABI dump directory names" am: 6daaa86fc1

Original change: https://android-review.googlesource.com/c/platform/development/+/2018035

Change-Id: I00f9319e5711cc639044b3c6dfca46957719668a