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

Change-Id: I038d81bec31cffb4aba7072e1ffbad2b04c2299a