Sync with upstream 2ccadef (svn revision 360428):

Do not overflow when calculating file system size.

Test: build
Bug: 155183047
Change-Id: I05a8f1b3ef10ec6a765a78adf122f274dcda12cd