Merge "Handle multiple APKs from the same package in check_target_files_signatures.py."