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

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

Change-Id: Ie95e555c14d669bed4183cfaf9adcb37aab5fa62