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

Change-Id: Idf58b96216150d48ce4d73a03eb1898133f0cca3