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