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

Also fixed an NPE when parsing some invalid AVDs.
2 files changed