am e78015c1: Plug the Android SDK window as the AVD manager.

Merge commit 'e78015c12dc2598a466eec76aa57f72280e09bcf'

* commit 'e78015c12dc2598a466eec76aa57f72280e09bcf':
  Plug the Android SDK window as the AVD manager.