Test: make and boot (partially cherry-picked from commit 246dccf9) Change-Id: Id3ce5fdee116df264241dfdee95734ac4bbad7ce