Merge "Add dirty-images-objects handling to boot image build."