Merge "Support statvfs on API levels before 19." am: 37ff081e88
am: 8049184be8

Change-Id: Ie1965436adde150fefe0a638a5a1016b86102d78