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

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

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build