fix merge-related regression affecting bootimage build
fix merge-related regression affecting bootimage build

dicej/avian,minor-jason/avian,ucdseniordesign/avian,marcinolawski/avian,minor-jason/avian,bgould/avian,lwahlmeier/avian,marcinolawski/avian,bigfatbrowncat/avian-pack.avian,badlogic/avian,MaartenR/avian,MaartenR/avian,lostdj/avian,lostdj/avian,joshuawarner32/avian,getlantern/avian,joshuawarner32/avian,bgould/avian,dicej/avian,getlantern/avian,MaartenR/avian,ucdseniordesign/avian,MaartenR/avian,bigfatbrowncat/avian-pack.avian,lostdj/avian,lwahlmeier/avian,minor-jason/avian,getlantern/avian,dicej/avian,marcinolawski/avian,bgould/avian,joshuawarner32/avian,marcinolawski/avian,bigfatbrowncat/avian-pack.avian,lwahlmeier/avian,getlantern/avian,bgould/avian,lwahlmeier/avian,lostdj/avian,badlogic/avian,ucdseniordesign/avian,ucdseniordesign/avian,dicej/avian,bigfatbrowncat/avian-pack.avian,badlogic/avian,badlogic/avian,joshuawarner32/avian,minor-jason/avian