Merge "Use getCompressedSizeLong to get correct size for 2G file" am: ee1720cffa
am: d3ffd42b19

Change-Id: Ide26ef75790cf6a5ba6ca4828a163a53c78111f2