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 am: 84f9efb903 am: 0bc85c2236
am: ae9933be12

Change-Id: I4dea24090b3e454cfa1799a4260c5b3e865fa4a8