am d61266d0: am 4928d8d0: Merge "Fix ExtractEntryToFile."

* commit 'd61266d0167816e653141f7f3c6579f2a65944db':
  Fix ExtractEntryToFile.