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

Change-Id: I2cc4cf5e95bb624b8cef6ebde3852fb975f7cbca