Revert "Switch to aosp recovery"

This reverts commit 023866f509d32104f7e3a589062863555efd1fc9.