Merge "Use setmntent with "e" option"
am: 396040ca2c

Change-Id: I4ccb2a328f1203ab1fc9d5c58d89551f737d58b6