Merge "recovery_utils: Use libvoid_headers."