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

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

Change-Id: Iaad678c4809405a72aa3c395e09df70552c08f21