ramdisk: merge pyramid ramdisk with holiday to try and resolve booting issues

Change-Id: I5a22c079cb74892b1f725a73144aa3225380bbbf