Merge "Remove the obsolete logic in img_from_target_files.py." am: ba029141dc am: f37c956b6d am: 464fed4f53
am: 30295a396f

Change-Id: Ib036b1b21f31a379086b3b5cbaccbfa732758210