Merge "Allow acov --prep to succeed in a clean build."