Merge "Fix inverted error message" am: 8f33dcc9e3 am: b8cc59cfd3

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

Change-Id: Ib360cbbc1877123977079fb71ec75a5f911b4e62