Merge changes from topic "use-libclang-cpp" am: a226ebf313 am: dfa837214d am: 361f6dd6a4

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

Change-Id: Ia3641d4fd06c20564160578984d2f49bbad3788a