am a97e8c7f: am fadf474e: Merge "AVD Manager: change button order, avd/dev-manager icons." into idea133 automerge: c289009

* commit 'a97e8c7f77d777a1faeb48c467be06e9bbb83665':
  AVD Manager: change button order, avd/dev-manager icons.