Merge "ziparchive: Allow ExtractEntryToFile() to work with block device." am: 787482ecd9 am: af2a8858c4
am: 9b1b0627b9

Change-Id: I9f18ea7b4ae15131a84c5db00ad078636d37215f