Merge "vold: Grant root group" am: 732def209c
am: 66166118d2

Change-Id: I4fa1f6c4f0c58ef8c51e1648bf00daab2aa0f5a6