Merge "Put system_version in target_files.zip"