Merge "device-tests & general-tests: build out zips." am: dd908dd925
am: 0aa305aacc

Change-Id: I7c45274e789d1722c333b1dcfa2be50c1cd685fc