[automerger skipped] Merge changes from topic "gcov-clang-migration" into rvc-dev am: e02730e29a
am: 5e47760ef3
-s ours am: 85f842ced7
-s ours
am skip reason: Change-Id Ib26a0e29f09b87400fd8bc41d2c06a4a8a397a19 with SHA-1 b6ff8225b1
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12040351
Change-Id: Idd5d5265d9740a334c8415a2255ebda1b8cb9dbf
This commit is contained in: