Merge "vold: remove access to /proc/net files"
am: b1f6942c79

Change-Id: Ic075f22143eae70a1b4197816e089ed0d735c007