Refactor features not to include dependencies

This will allow us not to include exact versions of our dependencies in
our features.

Bug: 539747
Change-Id: I6d6f90ad4c481567b0e566d055cc25e2ebc00202
5 files changed