Merge "Fix broken darwin build." am: e3c24b1c77

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

Change-Id: I50d2bbc7e1897b9cfadf2f24a36f1f4edea8976a