[Merge] livecd-rootfs:fix-riscv64-no-subarch into livecd-rootfs:ubuntu/master

[Łukasz Zemczak]

The regression has been introduced by https://code.launchpad.net/~alexghiti/livecd-rootfs/+git/livecd-rootfs/+merge/424678 and some subsequent commits.
-- 
https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+merge/427627
Your team Ubuntu Core Development Team is requested to review the proposed merge of livecd-rootfs:fix-riscv64-no-subarch into livecd-rootfs:ubuntu/master.