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

* commit '1532b77b019eacf634ae4546877c0f6a639c954a':
  Allow acov --prep to succeed in a clean build.