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

Change-Id: I1bdfa6a248cfb58abfc59970c82c466595c2d91e