Have the remove action inherit from the uninstall one.

Instead of repeating similar items in the remove action
just inherit from the uninstall one and activate the
uninstall action and then the remove action when triggered
since removing is also an uninstall.

Change-Id: I9419a2b3b0108e01f6412264fb9021ce23c7023d
Merge "Have the remove action inherit from the uninstall one."