Additions to support full-image build'ing for USB and emulators.