Remove redundant device name from zip file.

Change-Id: I44ff32fa8653a7bea459f67ed03e5e5481d88e82