Merge "vold: include multiple devices for calculating storage size" into main