Merge "Remove CPU variant from ABI reference dump paths"