Merge "Revert "Add /boot files as ramdisk_boot_file.""