Merge "Remove CPU variant from ABI reference dump paths" am: 2a6f31a2bd am: 3a13e9e585
am: 271c7ab892

Change-Id: I5998f390ea341e9bcb3e47deae967dddcf7c0d17