Merge changes I46e851c8,I2c9eb248 am: eed4716def

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

Change-Id: Ia06d55924cabe34eb443e384f231b789e583bb38