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

Change-Id: Ia1bdbd501d4624cd1e02f7521300418d6130cb6b