Merge "Revert "Migrate to the new clang lib dir"" am: 05c9290c30

Original change: https://android-review.googlesource.com/c/platform/development/+/2439794

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