Merge "Migrate to the new clang lib dir" am: b1785dc0a8 am: 792e644ad0 am: c57fcd8b05

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

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