Merge "Clean up the zipfile creation in InstallTest" am: 41cb6a65ac
am: 078034d300

Change-Id: I813e1b3f3b84171cf0e138a40ea3b6f803b3165f