Updates for vold based recovery, thanks to pawitp