Vold: back to AOSP