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

Change-Id: If13da04a9cff5a54665626397b9c6bc165df10c7