Merge changes from topic "mixed-bp2build" am: a5f86249a4

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

Change-Id: Ife9676229ca007e495bf9ed54d877f4d2cb3b9ea