Revert "HACK: report CPU abi as 2nd arch if present"

This reverts commits 8179d4dcf658f195aa21040b88cc0e70e66cdcd5,
00c67a056837b5ebda1bda950265a1fa086b4e53, and
d00c0a2e20c5df26066d44175a8da29ccf4e76a6.

Bug: 15933961
2 files changed