Selection code isolation.

Collapse the "addons" package into it's parent since
   it doesn't have a distinct role.
Eliminate remaining testing deps on non-selection code.

Bug: 64847011
Test: Passing.
Change-Id: I60260777b6fc55df78a523b82f5c40a39490ace1