Merge "Avoid AVD type failing for the new AVD."