Revert "aries-common: TWRP-ify"

This reverts commit 92cfd09c5e032277e15552da46c855ba1cc95947.