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

Change-Id: I7a763e2d09403cf2c2ea3fe0fb876463b73392ab