Merge "releasetools: Make merge_target_files and its test Python 3...
Merge "releasetools: Make merge_target_files and its test Python 3 compatible." am: 6e3ae4e8 am: ec2f3da2 am: 9b82724e
am: 451f1950
Change-Id: I2d0a2198ac486bc874e83c8ada863ba07a296135