Merge "Revert "HACK: report CPU abi as 2nd arch if present"" into lmp-dev