Merge change 663 into donut

* changes:
  Fix ADT#1807821: -f option ignored when avd dir already existed.