Merge "Use uint32_t instead of int to support 2~4G file"
am: b4ce717ae5

Change-Id: Ib020b948f04d4a3ebe2bde865bfa35ca3d9ab810