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

Change-Id: If6aa956c2d5355c7ce0ab93cb9a2d4e93a629501