Merge "Support re-generating DTBO image from add_img_to_target_files.py." am: 4536e45f66
am: b88e3f20a6

Change-Id: I6f0ea6434516be6f71285f9b715a8f9bb0d8b3b3