Ensure golden images list matches test images list.

Refactored code to work for the case where we are using Chameleon.
Introduced a bug where the sequence of time stamps was computed
twice. This is random we ended up with non matching golden images
and test images.

BUG=None.
TEST=Ran locally on squawks, which is passing on 42. (42 does not
the breaking change.). Test Passed.

Change-Id: Ia5759ad0aa61b999361f8464a900afd1012549ce
Reviewed-on: https://chromium-review.googlesource.com/264013
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
Commit-Queue: Mussa Kiroga <mussa@chromium.org>
Tested-by: Mussa Kiroga <mussa@chromium.org>
1 file changed