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

Change-Id: I549cb383c34efebc553926d5acae4fac7861c5eb