am f2ebd304: am 57aadbb0: Merge "enable support for large files (> 2G)"

* commit 'f2ebd304c3c0822121e6a4d0f542a048a7fc3b20':
  enable support for large files (> 2G)