Merge change 5638 into donut

* changes:
  Skins can now provide their own hardware support (via AVDs)