Merge "fix AVD Manager name." into idea133