Merge "Remove the obsolete logic in img_from_target_files.py." am: ba029141dc
am: f37c956b6d

Change-Id: Iad1c47544f82bf21297b4fdb36e983ff7a4dab38