Merge "Add dirty-images-objects handling to boot image build." into oc-mr1-dev
am: 4f3bce897b

Change-Id: I5606e5f1c41f71f3986b6ced42369f3540a30ebc