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