Merge "releasetools: Use fixed timestamp in otacerts.zip." am: 7b049f7
am: 480449d

* commit '480449dfc60bcaac4596c2d76daaa3ee374ee222':
  releasetools: Use fixed timestamp in otacerts.zip.

Change-Id: I7c73f9c95c2e4da61abfceef99013fccc25204c9