Merge "Keep AVD info in local goldfish instance directory"