Merge changes Iba57c949,Ief43ff51,Ib1809a4d,I2ab64f36 am: b08a091502

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

Change-Id: I35120d93123cdcda523c5bfe076f93254a0227c2