Merge "Use common.RunAndCheckOutput() in add_img_to_target_files.py."
am: f21a8f5376

Change-Id: I1c6606023008b0d22965066aceec55de7f25fb8f