Some cleanup, fixes, use new vold hack

Change-Id: Ia2e5ebea8599ff4fd3d2ac8b443a37cae2aadc86