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

Change-Id: If6d5e06e6d169a6d359c9e4ca754bfae07aeffa7