aries: boot: Fix cmdline
aries: initramfs: Merge upstream changes CM M11