Add armv7hl/armv7tnhl -> armv8el and i486 -> i586/i686 mapping

Signed-off-by: Juha Kallioinen <juha.kallioinen@jollamobile.com>