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

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

Change-Id: Ia9af358847b2f48fe6b5e976007f0a69e41c22f0