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

* commit '079040bb6736433865d6da11295e28a2309ec442':
  AVD/SDK Launchers win build.