Use new marvell kernel flavour for orion5x and kirkwood

The orion5x and kirkwood flavours have been combined into a marvell
flavour in Debian's 4.4 kernel.  We'll keep orion5x and kirkwood as
subarchitectures in d-i, but we have to use the new marvell kernel.