Merge sdk4.4 changes in vold for internal_sd mounting