[automerger skipped] Merge changes from topic "gcov-clang-migration" into rvc-dev am: e02730e29a
-s ours am: 86b2979342
-s ours am: 54fcaaddaa
-s ours
am skip reason: Change-Id Ib26a0e29f09b87400fd8bc41d2c06a4a8a397a19 with SHA-1 74f121d18f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12040351
Change-Id: Ifdbfff44a9b86c0b0d273def7489ba82ad87106f
This commit is contained in: