Merge change 3622 into donut

* changes:
  Move the custom widgets for avd/targets/apk-config into internal.widgets