Merge "Add support for building without ramdisk"