Merge "Don't use `unzip -t` when `unzip -l` will do." am: a803d77648 am: c26bc5cc4f

Change-Id: I36e4532c3030fc22f112c6ecb3d22f26aa1f80ce