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

* commit '153c03acc247ef283ed27d83e9286425b651a816':
  Fix ExtractEntryToFile.