am 9f30bb1c: Merge change 20889 into donut

Merge commit '9f30bb1c473890864104815c83725b314bb96df7'

* commit '9f30bb1c473890864104815c83725b314bb96df7':
  Properly update the new path of the AVD during an 'android avd move'