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 am: b6689367ee
am: 1d9bd9c412

Change-Id: Id4755753dc19ed16f1555164b6fa44bce8992e43