Merge "Replace libc++.so.1 with libc++.so" into main am: 9ec80322 am:...

Merge "Replace libc++.so.1 with libc++.so" into main am: 9ec80322 am: e9c4b394 am: 41b77aa0 am: 8c766aeb am: abd2aae6 am: 12f52d72

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



Change-Id: I11b9c8aaebe0b8a857131ac08f554eccd03f5359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>