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: a777abe3f6

Change-Id: I2b70aff183f8f97da7a8fb2ec9d1b31bbd36c722