Revert "track twrp from disco2 and remove aosp recovery<"

This reverts commit 836ca3c75ee1c75d19d3a9c45209083e3f7e64e0.

Conflicts:
	default.xml