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

Change-Id: Ia98ad8b270c0dde4229b9b6ea4ffa956a2d7fd37