Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b...

Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b am: 4f8d04b6 am: d75823a4

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

Change-Id: I32ef66c673653e2ed32bd824c6d59a181327a222