Merge change 20889 into donut

* changes:
  Properly update the new path of the AVD during an 'android avd move'