Merge changes I4e7aa1a3,Ic0cd2411 am: 2e380e7971 am: b8e95806f8

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

Change-Id: I9f5ed30258d6e7c9fde544b4482c58d910e9fa7b