Fix two annoyances with compiling Firecracker through devtool/test#5157

roypat merged 2 commits intofirecracker-microvm:mainfirecracker-microvm/firecracker:mainfrom

roypat:better-compilationsroypat/firecracker:better-compilationsCopy head branch name to clipboard