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