Merge "du: 32 bit systems were maxing out at 2GB when they should max out at 2TB (1<<32 blocks * 512 bytes, done with unsigned 64 bit math)."
am: fad2309530

Change-Id: Ib2dd0d8d17468c8155921d3d97b6e3f1e7722857