Manual: Unify and simplify manual uninstallation for couple targets.

Change-Id: Ib90aaf3652be4ea4cfc5f873aa5ab1f4ef4dd004
5 files changed