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

Change-Id: Ife1196b6cb7c7b9f395c81929b57b31db78fd026