Merge "AVD/SDK Launchers win build." into idea133