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

Change-Id: I014ce603524c917cfa2f3011788fd25db01b1f6a