Merge "releasetools: Clean up sign_target_files_apks.py."
am: 7d100ce03b

Change-Id: Iaf34dbeadd8352231592edb518101851ac959c63