Merge "Add dirty-images-objects handling to boot image build." am: 5848fedea8
am: 3b16c4e7c7

Change-Id: I2786f4baa79a9842d91426a721cee80b1f039900