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

Change-Id: I2ed176349eca3edde89ecf1d6d1dab8c79823ae6