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

Change-Id: I5a9d945eaf1361396466107b5abb4ca4d089fefd