Merge "ANDROID: fix overwrite and increase the memory gap for kernel and initramfs" into main