Squash UMS Commits [2/3]

Credits: CyanogenMod

Change-Id: Ieb2a7c0e125c7ca7a5751a2ebd1c02eb92cef2bb
Merge branch 'kk4.4' of https://github.com/SlimRoms/android_system_vold into kk4.4