Fix CREATE_AVD..............................