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

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

Change-Id: I9bf013110235bca0bc77329ec14ebef2677d871f