Merge change 4425 into donut

* changes:
  First step of a more standalone AvdSelector.