Merge "Fix file offset overflow issue when file's size > 4G" am: 849299cdc8 am: 8c350c8f5b
am: b0012be05f

Change-Id: I2a21931a8194b3d75a811a589acc12a1dcea89aa