Merge "Revert "aconfig: remove libcxx dependency for now"" into main am: 6a04d1e5 am: 51f8db5d

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



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