Merge "Don't use `unzip -t` when `unzip -l` will do." am: a803d77648 am: c26bc5cc4f am: 54f911f8b2 am: 7f97abd13b am: 798ada5a60

Change-Id: Iab38f2cbdd541fcd92875be58e9586a2c7cb068a