Merge "Small fixes to get the boot image compiled in debug mode."