Merge "vold: support more than 1 UMS share" into android-4.4