[autotest] Rebase prod onto master, not prod onto prod.

BUG=None
TEST=Ran

Change-Id: I75308feea37b00af04409dbb8ecd0114cb81b559
Reviewed-on: https://chromium-review.googlesource.com/206917
Reviewed-by: Alex Miller <milleral@chromium.org>
Commit-Queue: Alex Miller <milleral@chromium.org>
Tested-by: Alex Miller <milleral@chromium.org>
1 file changed