Merge "Vold should still create obb / data dirs for sdcardfs device"