am 9a5afa52: am 5e23069b: Merge "build_image.py: Use a fixed timestamp in the generated image."
am 9a5afa52: am 5e23069b: Merge "build_image.py: Use a fixed timestamp in the generated image."

* commit '9a5afa5242a4d179fc45f59944c0fba5ccaa4c15':
  build_image.py: Use a fixed timestamp in the generated image.

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