[automerger skipped] Merge "Use single module for clang runtime libraries" am:...

[automerger skipped] Merge "Use single module for clang runtime libraries" am: b60e8fb7 am: 7e8a93cf -s ours

am skip reason: Merged-In Ie01cbca9cee73bf39ed54eca306d45f0bd4f3867 with SHA-1 13bbb49c is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2027384

Change-Id: Ia62ef11dba601f50a070f12e74610751af3e69dc