Merge "Fix "Can't use getmntent or getmntinfo to check for mounted filesystems!" warning." am: cf227fe795 am: e67369eb91
am: 95460e4842

Change-Id: I0ba45dc98c047b6811c23f55e278957f29f08103