cleanup
Update vold.fstab
merge upstream
add tools to automatically recreate the local_manifest.xml