Merge commit '1d7be8653c61636f56d707f11409fc84ba85d37c' * commit '1d7be8653c61636f56d707f11409fc84ba85d37c': Move the custom widgets for avd/targets/apk-config into internal.widgets
Merge commit '1d7be8653c61636f56d707f11409fc84ba85d37c' * commit '1d7be8653c61636f56d707f11409fc84ba85d37c': Move the custom widgets for avd/targets/apk-config into internal.widgets