Change to <product>-<release>-<variant> form

Bug: 309555674
Test: compare_images_and_print.sh
Change-Id: I551a13b38f776916844fb9f89f08c04dbb8185e7
1 file changed