Merge changes I4e7aa1a3,Ic0cd2411 am: 2e380e7971 am: b8e95806f8 am: f26abe2744 am: 3ed3b56945

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

Change-Id: I042a767f7a3a1222f8e5789b5db8d29aff8b69e6