Merge changes from topic "uses-libs-5" am: 8fab5bcce3 am: a4cdcd3796 am: 21b5ffa966

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353554

Change-Id: I4aa8ff98526ceb6b1475eae1f284ce7ca18bb8b2