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

Change-Id: Ic604d1afa537906033f2a4b59e9c0931bcaad29e