Merge changes from topic "soong-clang-version-fix" am: 39f573eb00

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

Change-Id: I3e71ed8e41ee1b4a7a9693bfb88613d45e0d53b1