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

* commit 'df39ce3929b2fe08ecc09740680af258a51aed63':
  Fix ExtractEntryToFile.