Merge "releasetools: Use "ota-downgrade=yes" for --override_timestamp."
am: 3d840c6b98

Change-Id: I8675ca84c7fb49b66fcba18c2500c69b7ae79e37