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

Change-Id: I11ab52e83c3c30a2bfd86aa349aa76d5932ad5b5