Merge "DO NOT MERGE: Fix expected error for missing ZIP local header magic." into nougat-cts-dev
am: b8649b56a2  -s ours

Change-Id: I51f28f1468d2dbd38d9e7aee2a5f6b9570c7f26a