- merge "recovery: Don't link with minivold"
- merge "Revert "Revert "recovery: fix --update_package using legacy path"""