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: a801c5019b am: ee023b2c4a am: 0d4acb353d
am: b68f2f0377

Change-Id: I97c8d6d2c3952c2689da91c95ab0fb89304c7131