Merge "Merge "zip_archive: reject files that don't start with an LFH signature." into lmp-dev am: 64406ab149 am: fcf9c96fff  -s ours am: 95584d203f am: 5d8784c53d am: d86a41ea39 am: 36424c8f5f am: b70bb65f24 am: 626bb148e6 am: 45ce8549c4 am: d27178e362 am: 1bab31a4df am: 3fb0e4ae70 am: 3cee49d066 am: 96eba1ea02" into oc-mr1-dev-plus-aosp
am: be1ca3be52

Change-Id: I39169b7619f79e726d8dc001839ab1537b353013