Merge changes I2373d366,I908496d9 am: c7a4de25c1

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

Change-Id: Id7cf46fe0e98bf51d2e3a9364513d64f18e09466