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

Change-Id: I92afbb0d8a4ee74c8b5b9ce0bce359bd07043550