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

Change-Id: Ia43509c3aaf7bb6308ec940104e1c3b3a68570c9