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

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

Change-Id: Ide3d8aa39d30c1449055eca4f3dd83491de7a0e0