am aaecc136: Merge "AVD/SDK Launchers win build." into idea133 automerge: c86e450

* commit 'aaecc136296eb992f1ad5a6b099b5b8d8a8eda3a':
  AVD/SDK Launchers win build.