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

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