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

Change-Id: Ic58da2c810298c614644780f2cd175f63857c219