Merge "mntent_test: don't assume /proc isn't the first mount." into android10-tests-dev