Merge "Remove CPU variant from ABI reference dump paths"
am: 2a6f31a2bd

Change-Id: I1e76d4e23320597bca0968ffc87a3e57f2520e2f