am 5df7366e: am f698ca63: Merge "Add the product version to target_files.zip."

* commit '5df7366e124da1b3c4c8b410da02a460258966b2':
  Add the product version to target_files.zip.