Merge "releasetools: Add support for --override_timestamp." am: e889893776
am: 19e700aaf9

Change-Id: Ibbc7c72c5c4718a46b244a392f5d047c4c59797c