Merge "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" into oreo-cts-dev