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

Change-Id: Iff0917f55cf73803f2c381985ef445ce9f423bb7