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

Change-Id: I1cfc84ca959a07c6f641404c1cd88762fd00cee8