Merge "Fix broken aosp-master-plus-llvm builds" am: 9a5db000

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



Change-Id: I9042eb1ce3ff4c4204d6f26745934736a2d11c9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>