Revert "aries-common: TWRP-ify"

This reverts commit 92cfd09c5e032277e15552da46c855ba1cc95947.

Change-Id: I4274dfe96320b66ca6bc2b68e18db9eccdc3a6c4