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

Change-Id: I34d7336f82e038ec054201a48d797cde73072c73