Merge "Remove arch variants from ABI dump directory names"