Merge changes Ifd056230,I97f26b78,I19d58582 am: e546621f3a am: c2f75a0a5f am: af33c1f575

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

Change-Id: Ic98644d2ac17f9825f45cd7806c17396d52916cb