am 386b8374: Merge "Allow acov --prep to succeed in a clean build."

* commit '386b8374152aef469d6e3d907bd34cd301936cf6':
  Allow acov --prep to succeed in a clean build.