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

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

Change-Id: Ie2255176432278bc84d3c9ad13da61c6f6772887